]> 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: f24a84f 39b89cd)
Merge branch 'master' into terencehill/bot_waypoints
authorterencehill <piuntn@gmail.com>
Sat, 29 Jul 2017 15:04:07 +0000 (17:04 +0200)
committerterencehill <piuntn@gmail.com>
Sat, 29 Jul 2017 15:04:07 +0000 (17:04 +0200)

Trivial merge