Merge branch 'master' into terencehill/bot_waypoints
authorterencehill <piuntn@gmail.com>
Tue, 29 Aug 2017 15:39:05 +0000 (17:39 +0200)
committerterencehill <piuntn@gmail.com>
Tue, 29 Aug 2017 15:39:05 +0000 (17:39 +0200)
commit98b2c4213abe04f3ec96a95471ba5fe5fe57e008
tree63ab76640f8ee5c3bc86a1df347e298dc7e79c2c
parentd46494d5749f142ed2c67f95c6946bab77ca522b
parente3827e09272ce54f06b3bd9e170d1444fff19b42
Merge branch 'master' into terencehill/bot_waypoints

# Conflicts:
# qcsrc/server/command/sv_cmd.qc
# qcsrc/server/impulse.qc
qcsrc/common/triggers/teleporters.qc
qcsrc/server/bot/default/bot.qc
qcsrc/server/bot/default/waypoints.qc
qcsrc/server/command/sv_cmd.qc
qcsrc/server/sv_main.qc