]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'fruitiex/newpanelhud' into fruitiex/newpanelhud_stable
authorFruitieX <rasse@rasse-lappy.localdomain>
Sun, 15 Aug 2010 18:42:53 +0000 (21:42 +0300)
committerFruitieX <rasse@rasse-lappy.localdomain>
Sun, 15 Aug 2010 18:42:53 +0000 (21:42 +0300)
1  2 
qcsrc/client/hud.qc

Simple merge