]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge remote-tracking branch 'origin/fruitiex/panelhud'
authorRudolf Polzer <divverent@xonotic.org>
Fri, 27 May 2011 18:19:34 +0000 (20:19 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Fri, 27 May 2011 18:19:34 +0000 (20:19 +0200)

Trivial merge