Merge branch 'master' into terencehill/bot_waypoints
authorterencehill <piuntn@gmail.com>
Sat, 19 Aug 2017 15:26:44 +0000 (17:26 +0200)
committerterencehill <piuntn@gmail.com>
Sat, 19 Aug 2017 15:26:44 +0000 (17:26 +0200)
1  2 
qcsrc/server/impulse.qc

Simple merge