]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into terencehill/vehicles_fixes
authorterencehill <piuntn@gmail.com>
Sat, 31 Aug 2013 10:21:48 +0000 (12:21 +0200)
committerterencehill <piuntn@gmail.com>
Sat, 31 Aug 2013 10:21:48 +0000 (12:21 +0200)
commit105c4e2c93cadac6c8b09a998333e2f5fe11a533
tree1c9c508a2d7530a8c94bb4759c78a4eab734f983
parent7926c2a80fe4075b306bd4d2669f9a3eb1a997a6
parent1b130c7ceb9f035ba250a879967d8356552bb914
Merge branch 'master' into terencehill/vehicles_fixes

Conflicts:
qcsrc/server/vehicles/spiderbot.qc
qcsrc/server/cl_client.qc
qcsrc/server/cl_impulse.qc
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
qcsrc/server/vehicles/vehicles_def.qh
vehicle_raptor.cfg
vehicle_spiderbot.cfg