Merge remote branch 'origin/master' into terencehill/newpanelhud
authorFruitieX <rasse@rasse-lappy.localdomain>
Wed, 4 Aug 2010 16:17:07 +0000 (19:17 +0300)
committerFruitieX <rasse@rasse-lappy.localdomain>
Wed, 4 Aug 2010 16:17:07 +0000 (19:17 +0300)
commitb42a2b0a6c12ccbb208bd8cafb0a8405adbc3ae0
treeeff412e128d1f5c01a6710fdacacdde51e86d388
parent3cca1ec505cc46254542066d63e81ca1ce2932b2
parentda0b48d6b1b5889fdba500a7f4f2269163bd1230
Merge remote branch 'origin/master' into terencehill/newpanelhud
defaultXonotic.cfg
qcsrc/client/hud.qc
qcsrc/client/hud.qh