]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' into terencehill/newpanelhud
authorFruitieX <rasse@rasse-lappy.localdomain>
Tue, 29 Jun 2010 07:51:23 +0000 (10:51 +0300)
committerFruitieX <rasse@rasse-lappy.localdomain>
Tue, 29 Jun 2010 07:51:23 +0000 (10:51 +0300)
1  2 
qcsrc/client/hud.qc

Simple merge