Merge remote-tracking branch 'origin/master' into samual/spawn_weapons
authorSamual <samual@decrux.(none)>
Fri, 1 Jun 2012 21:01:48 +0000 (17:01 -0400)
committerSamual <samual@decrux.(none)>
Fri, 1 Jun 2012 21:01:48 +0000 (17:01 -0400)
commitb7c49465049281c2d910b0f3b73a7fc1b7bd844e
treec167f49e9a91de049cbd1df315bfb54963007a04
parent27b73fb7a8c8529e0bb3ed45e5c07172e1685b6b
parenta57de583c5519f52114006290bc1ced6d36235b2
Merge remote-tracking branch 'origin/master' into samual/spawn_weapons
qcsrc/server/g_damage.qc