]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote-tracking branch 'origin/master' into samual/updatecommands
authorSamual <samual@xonotic.org>
Wed, 5 Oct 2011 06:17:52 +0000 (02:17 -0400)
committerSamual <samual@xonotic.org>
Wed, 5 Oct 2011 06:17:52 +0000 (02:17 -0400)
commit9d0acc2e4117dc6d1810a034c635a631cec501a8
tree1b060bd2fc378fb5835dfcb13b73c0138b4421fa
parentb2f9d91ff4f9da0c9592b89f7e38cc6f2beb188d
parent4dd3145f26ea8732c361a6fefbd00f6e82d8b8f6
Merge remote-tracking branch 'origin/master' into samual/updatecommands
defaultXonotic.cfg
qcsrc/server/defs.qh