]> 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: 7ec3c55 48ff84c)
Merge branch 'master' into terencehill/overkill_stuff
authorterencehill <piuntn@gmail.com>
Mon, 26 Sep 2016 15:04:42 +0000 (17:04 +0200)
committerterencehill <piuntn@gmail.com>
Mon, 26 Sep 2016 15:04:42 +0000 (17:04 +0200)

Trivial merge