Merge branch 'diabolik/pyriaplayermodel' of ssh://git.xonotic.org/xonotic-data.pk3dir...
authorFruitieX <rasse@rasse-lappy.localdomain>
Thu, 13 May 2010 07:01:08 +0000 (10:01 +0300)
committerFruitieX <rasse@rasse-lappy.localdomain>
Thu, 13 May 2010 07:01:08 +0000 (10:01 +0300)
1  2 
defaultXonotic.cfg
qcsrc/client/Main.qc

Simple merge
Simple merge