]> 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: 011bb51 902b641)
Merge branch 'fruitiex/newpanelhud_stable' into fruitiex/newpanelhud
authorRudolf Polzer <divverent@alientrap.org>
Thu, 17 Jun 2010 07:40:34 +0000 (09:40 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 17 Jun 2010 07:40:34 +0000 (09:40 +0200)

Trivial merge