]> 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: 13b8b07 57118bc)
Merge remote branch 'refs/remotes/origin/fruitiex/newpanelhud_stable'
authorRudolf Polzer <divverent@alientrap.org>
Tue, 31 Aug 2010 07:29:40 +0000 (09:29 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 31 Aug 2010 07:29:40 +0000 (09:29 +0200)

Trivial merge