]> 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: 73fa9f2 699a224)
Merge branch 'master' into terencehill/bot_waypoints
authorterencehill <piuntn@gmail.com>
Tue, 18 Apr 2017 23:11:39 +0000 (01:11 +0200)
committerterencehill <piuntn@gmail.com>
Tue, 18 Apr 2017 23:11:39 +0000 (01:11 +0200)

Trivial merge