]> 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: 555d23b 708976a)
Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir
authorRudolf Polzer <divverent@xonotic.org>
Thu, 4 Aug 2011 18:12:37 +0000 (20:12 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Thu, 4 Aug 2011 18:12:37 +0000 (20:12 +0200)

Trivial merge