]> 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: 02fcc0d 0fe210b)
Merge branch 'master' into terencehill/bot_AI
authorterencehill <piuntn@gmail.com>
Wed, 11 Jan 2017 15:05:06 +0000 (16:05 +0100)
committerterencehill <piuntn@gmail.com>
Wed, 11 Jan 2017 15:05:06 +0000 (16:05 +0100)

Trivial merge