]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote-tracking branch 'origin/master' into samual/updatecommands
authorSamual <samual@xonotic.org>
Thu, 17 Nov 2011 20:31:47 +0000 (15:31 -0500)
committerSamual <samual@xonotic.org>
Thu, 17 Nov 2011 20:31:47 +0000 (15:31 -0500)
commitf549654c23b2b27cd81d4a92ee990edd1b663747
tree3f865ea5f6b9f73a180884ece1df8902680087d2
parente382e2c4cdf1c3c73eac6a0fd7da073afb99b5d9
parentf09cd309310c3bad289ed7553a787eeedb2be881
Merge remote-tracking branch 'origin/master' into samual/updatecommands
defaultXonotic.cfg
qcsrc/client/main.qh