]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
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)
commitf817ef565e2a6e4ba98184e16ff34d6dabc615a7
tree8b1e813b49edfcc28f469c48308707881bc16f99
parentb925de6d5336903af1357ce1ab3b62a573ff99b7
parent98b2c4213abe04f3ec96a95471ba5fe5fe57e008
Merge branch 'terencehill/bot_waypoints' into martin-t/master