Merge remote-tracking branch 'origin/master' into divVerent/meleefix
authorSamual Lenks <samual@xonotic.org>
Thu, 9 May 2013 20:31:54 +0000 (16:31 -0400)
committerSamual Lenks <samual@xonotic.org>
Thu, 9 May 2013 20:31:54 +0000 (16:31 -0400)
commit94579b4c440f739c1203ea5e546d3fcadb884c51
tree77aaa30fc98f9678560560f908e7452faa750376
parentd2680c6ec0a3bc9839194268d3c8b40c160748b5
parent543beff6240a5ef6197c018fa3b1cc9120c6c44e
Merge remote-tracking branch 'origin/master' into divVerent/meleefix
qcsrc/server/w_shotgun.qc