Merge branch 'master' into fruitiex/newpanelhud
authorFruitieX <rasse@rasse-lappy.localdomain>
Wed, 2 Jun 2010 10:09:15 +0000 (13:09 +0300)
committerFruitieX <rasse@rasse-lappy.localdomain>
Wed, 2 Jun 2010 10:09:15 +0000 (13:09 +0300)
1  2 
defaultXonotic.cfg
qcsrc/common/constants.qh

Simple merge
Simple merge