]> 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: b925de6 98b2c42)
Merge branch 'terencehill/bot_waypoints' into martin-t/master
authorMartin Taibr <taibr.martin@gmail.com>
Tue, 29 Aug 2017 15:59:49 +0000 (17:59 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Tue, 29 Aug 2017 15:59:49 +0000 (17:59 +0200)

Trivial merge