]> 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: 678efa1 24ad2e2)
Merge branch 'master' of git://nl.git.xonotic.org/xonotic/xonotic-data.pk3dir
authorRudolf Polzer <divverent@xonotic.org>
Thu, 29 Aug 2013 11:51:26 +0000 (13:51 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Thu, 29 Aug 2013 11:51:26 +0000 (13:51 +0200)

Trivial merge