[ioquake3] 15/136: Merge pull request #277 from em92/master

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian/master
in repository ioquake3.

commit 25cc2edc699bfe23adfb6e5d12394587f572e440
Merge: d4e1a01 864f66a
Author: Tim Angus <tim at ngus.net>
Date:   Thu Mar 23 15:49:45 2017 +0000

    Merge pull request #277 from em92/master
    
    Fallback to generic a windres if a cross compiler one cannot be found

 Makefile | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/ioquake3.git