]> 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: d6a5359 7f7765c)
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
authorRudolf Polzer <divVerent@xonotic.org>
Thu, 30 Jun 2011 07:40:35 +0000 (09:40 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Thu, 30 Jun 2011 07:40:35 +0000 (09:40 +0200)

Trivial merge