]> 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: 7ea2e71 b127e12)
Merge branch 'master' into terencehill/CA_forbidspawn
authorterencehill <piuntn@gmail.com>
Thu, 1 Sep 2016 09:08:47 +0000 (11:08 +0200)
committerterencehill <piuntn@gmail.com>
Thu, 1 Sep 2016 09:08:47 +0000 (11:08 +0200)

Trivial merge