]> 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: 00a1eb2 1d5e154)
Merge branch 'master' of git://nl.git.xonotic.org/xonotic/xonotic-data.pk3dir
authorRudolf Polzer <divverent@xonotic.org>
Mon, 6 Jan 2014 09:58:53 +0000 (10:58 +0100)
committerRudolf Polzer <divverent@xonotic.org>
Mon, 6 Jan 2014 09:58:53 +0000 (10:58 +0100)

Trivial merge