Merge branch 'master' into terencehill/bot_waypoints
authorterencehill <piuntn@gmail.com>
Sat, 30 Dec 2017 17:54:49 +0000 (18:54 +0100)
committerterencehill <piuntn@gmail.com>
Sat, 30 Dec 2017 17:54:49 +0000 (18:54 +0100)
1  2 
qcsrc/server/impulse.qc

Simple merge