]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'fruitiex/newpanelhud' of ssh://git.xonotic.org/xonotic-data.pk3dir...
authorFruitieX <rasse@rasse-lappy.localdomain>
Fri, 14 May 2010 15:39:25 +0000 (18:39 +0300)
committerFruitieX <rasse@rasse-lappy.localdomain>
Fri, 14 May 2010 15:39:25 +0000 (18:39 +0300)
1  2 
qcsrc/client/hud.qc

Simple merge