]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge remote branch 'origin/master' into fruitiex/multijump
authorFruitieX <rasse@rasse-lappy.localdomain>
Sat, 14 Aug 2010 16:24:59 +0000 (19:24 +0300)
committerFruitieX <rasse@rasse-lappy.localdomain>
Sat, 14 Aug 2010 16:24:59 +0000 (19:24 +0300)
1  2 
defaultXonotic.cfg

Simple merge