Merge branch 'master' into terencehill/bot_waypoints
authorterencehill <piuntn@gmail.com>
Sat, 23 Dec 2017 17:51:09 +0000 (18:51 +0100)
committerterencehill <piuntn@gmail.com>
Sat, 23 Dec 2017 17:51:09 +0000 (18:51 +0100)
commit99f5aae787d0e46852e2340594c5cb4805c0f3f3
tree267ffd23cb15a3d9197afe5356bf5fa4dff91523
parent042089583dd3eae6bbe1cbdf85bd694d5bd1bb0c
parent5d43ce9b61ff0ac46e59bac1a011603fa75071cc
Merge branch 'master' into terencehill/bot_waypoints

# Conflicts:
# qcsrc/common/triggers/trigger/jumppads.qc
# qcsrc/common/triggers/trigger/jumppads.qh
qcsrc/common/triggers/trigger/jumppads.qc
qcsrc/common/triggers/trigger/jumppads.qh
qcsrc/server/bot/default/bot.qc