]> git.xonotic.org Git - xonotic/gmqcc.git/commit
Merge branch 'master' into test-suite
authorDale Weiler <killfieldengine@gmail.com>
Sat, 17 Nov 2012 09:56:48 +0000 (09:56 +0000)
committerDale Weiler <killfieldengine@gmail.com>
Sat, 17 Nov 2012 09:56:48 +0000 (09:56 +0000)
commit990dcb106a86ae880f55471412ff51356d56465c
tree06740a4ce248d714649df387037fd744e5720ed6
parent55491bbc234a1de31dfb43d1eab569e495cbb341
parent633313053709f0a156afb7f05892b6e67b2fac4a
Merge branch 'master' into test-suite

Conflicts:
Makefile
Makefile