]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote-tracking branch 'origin/master' into samual/weapons
authorSamual Lenks <samual@xonotic.org>
Fri, 28 Jun 2013 22:05:26 +0000 (18:05 -0400)
committerSamual Lenks <samual@xonotic.org>
Fri, 28 Jun 2013 22:05:26 +0000 (18:05 -0400)
commited4075570f716685cb3d5b721b8fc9c3f5b0921e
treec21a79a2165291a8caea27bb52dc45164ca767bb
parentd017b6c72e43cff9a37b0ce1a8e5f33d3f835b79
parent4122acc1401e4643ebe47d53b0488de83b93d787
Merge remote-tracking branch 'origin/master' into samual/weapons

Conflicts:
qcsrc/server/t_items.qc
qcsrc/server/weapons/cl_weapons.qc