]> git.xonotic.org Git - xonotic/gmqcc.git/commit
Merge branch 'master' into test-suite
authorDale Weiler <killfieldengine@gmail.com>
Sat, 17 Nov 2012 10:02:21 +0000 (10:02 +0000)
committerDale Weiler <killfieldengine@gmail.com>
Sat, 17 Nov 2012 10:02:21 +0000 (10:02 +0000)
commitd1fd7d044ba1470dd6c66b1f265ec3aafb829b07
treee6e6f802b1dd038581e8e90687b0944f9b1e90ff
parent227c85ba4e9f71f0a6493d6e123ad4ecc08bf0ac
parent852b2b91d27425d1d661e87060f0ff647713835d
Merge branch 'master' into test-suite

Conflicts:
Makefile
Makefile