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)
commit83b0c96edec0a188371873bb83b15d024568bca3
tree4547fa1828d77dfceea658c69fa0d5dc1cd07ec3
parent6272c4294e47802aa79728949c76b370c0a764e8
parent4d1b7ceaaa2e81845d000752273ae229c9db2d37
Merge branch 'master' into fruitiex/newpanelhud_stable
defaultXonotic.cfg
qcsrc/client/progs.src
qcsrc/common/constants.qh