]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 219c1a3 c75962c)
Merge remote branch 'origin/fruitiex/panelhud'
authorRudolf Polzer <divverent@alientrap.org>
Thu, 16 Dec 2010 20:53:17 +0000 (21:53 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 16 Dec 2010 20:53:17 +0000 (21:53 +0100)

Trivial merge