]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote branch 'origin/fruitiex/newpanelhud_stable' into fruitiex/newpanelhud
authorFruitieX <rasse@rasse-lappy.localdomain>
Wed, 16 Jun 2010 21:30:10 +0000 (00:30 +0300)
committerFruitieX <rasse@rasse-lappy.localdomain>
Wed, 16 Jun 2010 21:30:10 +0000 (00:30 +0300)
commite68dce50723891c441f89834240afa487a9dc25b
tree4c31d9c694ecb215dc5e9ade940b84db61266e1a
parentaa2250740f2faf6383658c37743a52b4984dd9fd
parent61538042b04bc6b8415276fcd0ef7723c02bd32c
Merge remote branch 'origin/fruitiex/newpanelhud_stable' into fruitiex/newpanelhud
qcsrc/client/Main.qc
qcsrc/client/hud.qc