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

Simple merge
Simple merge