]> 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: df6e6e4 af0db65)
Merge branch 'master' into terencehill/bot_AI 404/head
authorterencehill <piuntn@gmail.com>
Thu, 12 Jan 2017 13:29:37 +0000 (14:29 +0100)
committerterencehill <piuntn@gmail.com>
Thu, 12 Jan 2017 13:29:37 +0000 (14:29 +0100)

Trivial merge