Merge remote branch 'refs/remotes/origin/terencehill/newpanelhud'
authorRudolf Polzer <divverent@alientrap.org>
Fri, 10 Sep 2010 21:29:28 +0000 (23:29 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 10 Sep 2010 21:29:28 +0000 (23:29 +0200)
1  2 
defaultXonotic.cfg
qcsrc/client/hud.qc

Simple merge
Simple merge