]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
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)
commitf93bde9df83efabaa317f00474da6b2ac5642fab
treec53ec2698c9bbd88f825d4bae7cb71dcb5f7e257
parentef2594b3d93a01b2d694efe557dfaeab61cf5ff7
parent6b3f7d6fc917129765479348a8b3957c50af09d9
Merge remote-tracking branch 'origin/terencehill/bot_waypoints' into martin-t/master