]> 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: 98d078c c7c7ab4)
Merge remote branch 'origin/fruitiex/newpanelhud_stable'
authorRudolf Polzer <divverent@alientrap.org>
Wed, 21 Jul 2010 17:55:53 +0000 (19:55 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Wed, 21 Jul 2010 17:55:53 +0000 (19:55 +0200)

Trivial merge