]> de.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: 3c0f816 6f69158)
Merge remote branch 'refs/remotes/origin/fruitiex/newpanelhud'
authorRudolf Polzer <divverent@alientrap.org>
Thu, 29 Jul 2010 17:08:49 +0000 (19:08 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 29 Jul 2010 17:08:49 +0000 (19:08 +0200)

Trivial merge