Merge branch 'TimePath/remove_remove'
authorTimePath <andrew.hardaker1995@gmail.com>
Sat, 6 Aug 2016 06:20:15 +0000 (16:20 +1000)
committerTimePath <andrew.hardaker1995@gmail.com>
Sat, 6 Aug 2016 06:20:15 +0000 (16:20 +1000)
15 files changed:
1  2 
qcsrc/client/main.qc
qcsrc/common/effects/qc/casings.qc
qcsrc/common/effects/qc/gibs.qc
qcsrc/common/gamemodes/gamemode/onslaught/cl_generator.qc
qcsrc/common/t_items.qc
qcsrc/common/triggers/trigger/jumppads.qc
qcsrc/common/turrets/sv_turrets.qc
qcsrc/common/turrets/turret/ewheel.qc
qcsrc/common/turrets/turret/walker.qc
qcsrc/common/vehicles/cl_vehicles.qc
qcsrc/common/vehicles/vehicle/racer.qc
qcsrc/common/weapons/weapon/shotgun.qc
qcsrc/server/cl_client.qc
qcsrc/server/g_world.qc
qcsrc/server/sv_main.qc

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge