]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge remote-tracking branch 'origin/mirceakitsune/new_loading_screens'
authorRudolf Polzer <divverent@alientrap.org>
Sat, 14 May 2011 13:03:00 +0000 (15:03 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sat, 14 May 2011 13:03:00 +0000 (15:03 +0200)
1  2 
defaultXonotic.cfg

Simple merge