]> 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: c1d2e4b 85ee0c0)
Merge branch 'master' into terencehill/bot_waypoints
authorterencehill <piuntn@gmail.com>
Mon, 1 May 2017 13:18:02 +0000 (15:18 +0200)
committerterencehill <piuntn@gmail.com>
Mon, 1 May 2017 13:18:02 +0000 (15:18 +0200)

Trivial merge