]> 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: 717d02d 1db3891)
Merge remote branch 'origin/fruitiex/panelhud'
authorRudolf Polzer <divverent@alientrap.org>
Sun, 12 Dec 2010 13:50:24 +0000 (14:50 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 12 Dec 2010 13:50:24 +0000 (14:50 +0100)

Trivial merge