]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' into samual/menu_updates
authorRudolf Polzer <divverent@alientrap.org>
Sat, 21 Jan 2012 19:01:19 +0000 (20:01 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Sat, 21 Jan 2012 19:01:19 +0000 (20:01 +0100)
1  2 
defaultXonotic.cfg

Simple merge