]> 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: 3c2c513 f00588d)
Merge branch 'master' into terencehill/accuracy_shotgun
authorterencehill <piuntn@gmail.com>
Sun, 25 Feb 2018 01:16:00 +0000 (02:16 +0100)
committerterencehill <piuntn@gmail.com>
Sun, 25 Feb 2018 01:16:00 +0000 (02:16 +0100)

Trivial merge