Merge branch 'master' into terencehill/bot_waypoints
authorterencehill <piuntn@gmail.com>
Tue, 10 Apr 2018 10:17:42 +0000 (12:17 +0200)
committerterencehill <piuntn@gmail.com>
Tue, 10 Apr 2018 10:17:42 +0000 (12:17 +0200)
commit3cfa3eaf6856fe76f7fd8c945fbfab2e9e28014c
tree3ef7f858adfa1972fcdfb7502269e406100d6772
parent682699baead66b0e02be04c6e6e994f4804fcd61
parentfa89cf0047117339465be3fecefd15e8bc050b9f
Merge branch 'master' into terencehill/bot_waypoints
qcsrc/common/triggers/trigger/jumppads.qc