]> 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 | compact (merge: 4043720 b870fa4)
Merge branch 'master' into terencehill/bot_waypoints
authorterencehill <piuntn@gmail.com>
Sat, 13 May 2017 22:19:44 +0000 (00:19 +0200)
committerterencehill <piuntn@gmail.com>
Sat, 13 May 2017 22:19:44 +0000 (00:19 +0200)

Trivial merge