Merge remote-tracking branch 'origin/master' into Mario/classname_checks
authorSamual Lenks <samual@xonotic.org>
Fri, 10 May 2013 05:11:27 +0000 (01:11 -0400)
committerSamual Lenks <samual@xonotic.org>
Fri, 10 May 2013 05:11:27 +0000 (01:11 -0400)
commitc1fc567698f48fbfa3866c7a93406edad4823a1f
treeb511c520a220bfc119c0998268fd824a17005904
parentc92d2b2db2fef225b4bdc61102296c534010fc37
parent2c3d9f6a5a8c286aac7ca0d5192225d39532297f
Merge remote-tracking branch 'origin/master' into Mario/classname_checks

Conflicts:
qcsrc/server/cl_client.qc
qcsrc/server/g_damage.qc
qcsrc/server/t_items.qc
qcsrc/server/w_common.qc
qcsrc/server/waypointsprites.qc
21 files changed:
qcsrc/server/attic/assault.qc
qcsrc/server/bot/aim.qc
qcsrc/server/bot/havocbot/havocbot.qc
qcsrc/server/bot/havocbot/roles.qc
qcsrc/server/cl_client.qc
qcsrc/server/cl_physics.qc
qcsrc/server/cl_player.qc
qcsrc/server/cl_weaponsystem.qc
qcsrc/server/command/vote.qc
qcsrc/server/g_damage.qc
qcsrc/server/g_world.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/mutators/gamemode_ca.qc
qcsrc/server/mutators/mutator_superspec.qc
qcsrc/server/scores.qc
qcsrc/server/t_items.qc
qcsrc/server/teamplay.qc
qcsrc/server/tturrets/system/system_main.qc
qcsrc/server/vehicles/vehicles.qc
qcsrc/server/w_shotgun.qc
qcsrc/server/waypointsprites.qc