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)
commitb1a6464ea70a32dc63e3970d6c5f34a1b2fc7c2c
treed10991be6c1ea7680f86e298822d34c1aba642ee
parentdf74e91356805d8c98ee03b352808bbd6d3529cf
parentfe02cbd40c9f83f0741ec965529b8d39aac71215
Merge branch 'master' into fruitiex/newpanelhud
defaultXonotic.cfg
qcsrc/common/constants.qh