]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into terencehill/bot_waypoints
authorterencehill <piuntn@gmail.com>
Thu, 22 Aug 2019 00:07:59 +0000 (02:07 +0200)
committerterencehill <piuntn@gmail.com>
Thu, 22 Aug 2019 00:07:59 +0000 (02:07 +0200)
commit0f689f166f8b173cfe456d3446ee877b9a80bf35
tree32e19afd069f11e560ed21b3ad8d26aa6d1bac65
parentae8136f3299280bc0d357067c47989f886cf04e7
parent818f7b65eb4f591b8f3ed6c70ba86edab5144e1b
Merge branch 'master' into terencehill/bot_waypoints

# Conflicts:
# qcsrc/server/bot/default/havocbot/havocbot.qc
qcsrc/menu/xonotic/keybinder.qc
qcsrc/server/bot/api.qh
qcsrc/server/bot/default/havocbot/havocbot.qc
qcsrc/server/bot/default/waypoints.qc
xonotic-client.cfg