]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge remote branch 'refs/remotes/origin/fruitiex/gibeffectfix'
authorRudolf Polzer <divverent@alientrap.org>
Tue, 31 Aug 2010 20:04:36 +0000 (22:04 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 31 Aug 2010 20:04:36 +0000 (22:04 +0200)
1  2 
defaultXonotic.cfg

Simple merge