]> 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 | compact (merge: a9565c9 7316fb7)
Merge branch 'master' into fruitiex/newpanelhud
authorRudolf Polzer <divverent@alientrap.org>
Thu, 13 May 2010 11:56:01 +0000 (13:56 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 13 May 2010 11:56:01 +0000 (13:56 +0200)

Trivial merge