]> 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: 24c0e21 d272bca)
Merge remote branch 'origin/fruitiex/newpanelhud_stable'
authorRudolf Polzer <divverent@alientrap.org>
Sat, 19 Jun 2010 19:51:27 +0000 (21:51 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sat, 19 Jun 2010 19:51:27 +0000 (21:51 +0200)

Trivial merge