]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ef2594b 6b3f7d6)
Merge remote-tracking branch 'origin/terencehill/bot_waypoints' into martin-t/master
authorMartin Taibr <taibr.martin@gmail.com>
Sun, 29 Oct 2017 00:40:46 +0000 (02:40 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Sun, 29 Oct 2017 00:40:46 +0000 (02:40 +0200)

Trivial merge