]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw (from: ae2c140)
Merge branch 'master' into Mario/vehicles
authorMario <zacjardine@y7mail.com>
Fri, 21 Aug 2015 08:55:37 +0000 (18:55 +1000)
committerMario <zacjardine@y7mail.com>
Fri, 21 Aug 2015 08:55:37 +0000 (18:55 +1000)
# Conflicts:
# qcsrc/client/autocvars.qh
# qcsrc/client/main.qc
# qcsrc/client/tturrets.qc
# qcsrc/client/vehicles/all.qc
# qcsrc/server/g_world.qc
# qcsrc/server/vehicles/bumblebee.qc
# qcsrc/server/vehicles/racer.qc
# qcsrc/server/vehicles/raptor.qc
# qcsrc/server/vehicles/spiderbot.qc
# qcsrc/server/vehicles/vehicle.qc
# qcsrc/server/vehicles/vehicle.qh


No differences found