]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge remote branch 'origin/fruitiex/newpanelhud'
authorRudolf Polzer <divverent@alientrap.org>
Thu, 21 Oct 2010 20:08:18 +0000 (22:08 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 21 Oct 2010 20:08:18 +0000 (22:08 +0200)
1  2 
qcsrc/client/hud.qc

Simple merge