]> 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: 9d863cc 6f42646)
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
authorMirio <opivy@hotmail.de>
Mon, 27 Mar 2017 16:12:39 +0000 (18:12 +0200)
committerMirio <opivy@hotmail.de>
Mon, 27 Mar 2017 16:12:39 +0000 (18:12 +0200)

Trivial merge