]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'terencehill/bot_waypoints' into martin-t/master
authorMartin Taibr <taibr.martin@gmail.com>
Sun, 3 Sep 2017 19:14:40 +0000 (21:14 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Sun, 3 Sep 2017 19:14:40 +0000 (21:14 +0200)
commitd08d78a9247145b2545cdfd0c5d1dbf2e7981388
tree1a486998c333bc85f81876118040aa119aaf2eac
parenta660fac7921ee07350df0c54f87e2ebf67c7da9f
parent64e7b6ddf13d965e8a91746540dc06de3e4c16fe
Merge branch 'terencehill/bot_waypoints' into martin-t/master
qcsrc/server/sv_main.qc