Merge branch 'master' into TimePath/deathtypes
authorTimePath <andrew.hardaker1995@gmail.com>
Thu, 8 Oct 2015 05:09:36 +0000 (16:09 +1100)
committerTimePath <andrew.hardaker1995@gmail.com>
Thu, 8 Oct 2015 05:09:36 +0000 (16:09 +1100)
# Conflicts:
# qcsrc/common/util-pre.qh

1  2 
qcsrc/client/hud.qc
qcsrc/client/main.qc
qcsrc/common/mutators/mutator/waypoints/waypointsprites.qc
qcsrc/common/util.qc
qcsrc/common/vehicles/sv_vehicles.qc
qcsrc/server/cl_client.qc
qcsrc/server/g_world.qc
qcsrc/server/mutators/mutator_buffs.qc
qcsrc/server/t_items.qc
qcsrc/server/teamplay.qc

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