Merge remote-tracking branch 'origin/master' into samual/spawn_weapons
authorSamual Lenks <samual@xonotic.org>
Tue, 24 Jul 2012 21:21:49 +0000 (17:21 -0400)
committerSamual Lenks <samual@xonotic.org>
Tue, 24 Jul 2012 21:21:49 +0000 (17:21 -0400)
commitbc670765fe8263c7366ad8cd9b32eabfa39eeda7
treed685fe08684800e99b24cfb857c6ed6d5a9ce6b2
parentb1cbb8feb425171a679ba8a15ecfdd958793302a
parente07aef75650ef86c5b68ded7d37586b1d39d9282
Merge remote-tracking branch 'origin/master' into samual/spawn_weapons
qcsrc/server/g_world.qc
qcsrc/server/vehicles/racer.qc
qcsrc/server/vehicles/raptor.qc
qcsrc/server/vehicles/spiderbot.qc
qcsrc/server/vehicles/vehicles.qc