]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote-tracking branch 'origin/master' into samual/weapons
authorSamual Lenks <samual@xonotic.org>
Sat, 14 Sep 2013 04:01:15 +0000 (00:01 -0400)
committerSamual Lenks <samual@xonotic.org>
Sat, 14 Sep 2013 04:01:15 +0000 (00:01 -0400)
commita78aef04c4dcb416d041564e656da105eff84558
tree250858e231fc9bcc41e6f8cca3923d368a948c22
parent27df10dc4d7df0539ad7e4556d34b090c5d79645
parent00530e36d4c33eea2deffc8d528cb8904d3dc2b1
Merge remote-tracking branch 'origin/master' into samual/weapons

Conflicts:
qcsrc/common/weapons/w_tuba.qc
12 files changed:
qcsrc/client/miscfunctions.qc
qcsrc/common/command/generic.qc
qcsrc/common/util.qc
qcsrc/common/util.qh
qcsrc/common/weapons/w_tuba.qc
qcsrc/server/cl_client.qc
qcsrc/server/cl_player.qc
qcsrc/server/defs.qh
qcsrc/server/g_damage.qc
qcsrc/server/g_world.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/weapons/accuracy.qc