]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote-tracking branch 'origin/master' into samual/spawn_weapons
authorSamual Lenks <samual@xonotic.org>
Thu, 23 Aug 2012 23:46:01 +0000 (19:46 -0400)
committerSamual Lenks <samual@xonotic.org>
Thu, 23 Aug 2012 23:46:01 +0000 (19:46 -0400)
commit5cfe22a6d2dafe5732cf558da63ca5333cdd58ca
tree9bfefb94770713134ec0d66f3700d278a8ec345a
parented6c4221d4ec2efc3eea6c2e8069245e83d95378
parentc5121d69899c57253362a5a8d98d6a1435a5fb47
Merge remote-tracking branch 'origin/master' into samual/spawn_weapons
qcsrc/client/Main.qc
qcsrc/server/cl_client.qc
qcsrc/server/g_damage.qc
qcsrc/server/vehicles/bumblebee.qc