Merge branch 'master' into fruitiex/newpanelhud_stable
authorFruitieX <rasse@rasse-lappy.localdomain>
Mon, 7 Jun 2010 16:01:58 +0000 (19:01 +0300)
committerFruitieX <rasse@rasse-lappy.localdomain>
Mon, 7 Jun 2010 16:01:58 +0000 (19:01 +0300)
1  2 
defaultXonotic.cfg
qcsrc/client/progs.src
qcsrc/common/constants.qh

Simple merge
Simple merge
Simple merge