]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote branch 'origin/master' into terencehill/centerprint_stuff
authorSamual <samual@xonotic.org>
Mon, 15 Aug 2011 21:53:53 +0000 (17:53 -0400)
committerSamual <samual@xonotic.org>
Mon, 15 Aug 2011 21:53:53 +0000 (17:53 -0400)
commitff029da4a92ae6c3520341a427dc904d20fe6cce
treeb120a1ae5993979bfa5c80c9b9f2f0fe493852e1
parentd8102a4b1f5ddbaa66ea65195a8fff0c90e15529
parentefbe6dfb7724a7a816ddae92868b611c67727160
Merge remote branch 'origin/master' into terencehill/centerprint_stuff
defaultXonotic.cfg
qcsrc/server/g_world.qc