]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge remote branch 'origin/fruitiex/loadscreen'
authorRudolf Polzer <divverent@alientrap.org>
Sun, 12 Dec 2010 21:05:17 +0000 (22:05 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 12 Dec 2010 21:05:17 +0000 (22:05 +0100)
1  2 
defaultXonotic.cfg

Simple merge