]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge remote-tracking branch 'origin/terencehill/improved_g_ctf_reverse'
authorRudolf Polzer <divverent@xonotic.org>
Mon, 25 Jul 2011 16:52:39 +0000 (18:52 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Mon, 25 Jul 2011 16:52:39 +0000 (18:52 +0200)
1  2 
defaultXonotic.cfg

Simple merge