Merge branch 'master' into terencehill/bot_waypoints
authorterencehill <piuntn@gmail.com>
Sat, 20 May 2017 12:29:16 +0000 (14:29 +0200)
committerterencehill <piuntn@gmail.com>
Sat, 20 May 2017 12:29:16 +0000 (14:29 +0200)
commit5a356ff39bd87af74db73b8fc36cc9613e60f2e7
tree9b6fc95b622029af8b72ef2451298adcad871c2f
parent736f0b6d29fa0d1f820bf9618814d7a83d7394e0
parenta288f3ad5c63019c78ab555b3442488a08b0556f
Merge branch 'master' into terencehill/bot_waypoints

# Conflicts:
# qcsrc/server/bot/default/navigation.qc
# qcsrc/server/impulse.qc
qcsrc/common/triggers/func/ladder.qc
qcsrc/server/bot/default/navigation.qc