projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bcd9519 f1b56e5)
Merge branch 'master' into terencehill/bot_waypoints
authorterencehill <piuntn@gmail.com>
Mon, 5 Jun 2017 12:54:08 +0000 (14:54 +0200)
committerterencehill <piuntn@gmail.com>
Mon, 5 Jun 2017 12:54:08 +0000 (14:54 +0200)

Trivial merge