Merge branch 'master' into terencehill/vehicles_fixes
authorterencehill <piuntn@gmail.com>
Sat, 4 Jan 2014 18:48:00 +0000 (19:48 +0100)
committerterencehill <piuntn@gmail.com>
Sat, 4 Jan 2014 18:48:00 +0000 (19:48 +0100)
commit0f0e69c6625fc4db17559e2e47f2fdaed8298076
tree212fb8ff92ba50724defa85f89435f29437e3819
parent28db67726bdcc01ded4d4c942326dfc7f7375e18
parente23579dcf3caf46f7d186bfc4b641458b36b5365
Merge branch 'master' into terencehill/vehicles_fixes

Conflicts:
qcsrc/server/vehicles/bumblebee.qc
qcsrc/server/vehicles/raptor.qc
qcsrc/server/vehicles/spiderbot.qc
qcsrc/server/cl_client.qc
qcsrc/server/cl_impulse.qc
qcsrc/server/mutators/gamemode_assault.qc
qcsrc/server/vehicles/bumblebee.qc
qcsrc/server/vehicles/racer.qc
qcsrc/server/vehicles/raptor.qc
qcsrc/server/vehicles/spiderbot.qc
qcsrc/server/vehicles/vehicles.qc
vehicle_spiderbot.cfg