]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' into divVerent/crypto2
authorRudolf Polzer <divverent@alientrap.org>
Wed, 15 Sep 2010 11:03:34 +0000 (13:03 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Wed, 15 Sep 2010 11:03:34 +0000 (13:03 +0200)
1  2 
defaultXonotic.cfg

Simple merge