]> 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>
Fri, 17 Aug 2012 16:55:09 +0000 (12:55 -0400)
committerSamual Lenks <samual@xonotic.org>
Fri, 17 Aug 2012 16:55:09 +0000 (12:55 -0400)
commitc09829a6706a1a02900436712e5b036a0b64d30a
tree352f7d6187e43ac5288fe5b7cfe77cf407514f10
parent84e056365a47654c53b31cda96f6c87196ff7509
parent9b8e4169c3e2e2b7dc86155d583f6d5aa740dc1d
Merge remote-tracking branch 'origin/master' into samual/spawn_weapons

Conflicts:
qcsrc/common/constants.qh
qcsrc/server/vehicles/bumblebee.qc
12 files changed:
qcsrc/client/Main.qc
qcsrc/common/constants.qh
qcsrc/server/cl_client.qc
qcsrc/server/g_damage.qc
qcsrc/server/g_world.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/progs.src
qcsrc/server/vehicles/bumblebee.qc
qcsrc/server/vehicles/racer.qc
qcsrc/server/vehicles/raptor.qc
qcsrc/server/vehicles/spiderbot.qc
qcsrc/server/vehicles/vehicles.qc