Merge branch 'master' into sev/luma_hud_vehicles
authorMario <zacjardine@y7mail.com>
Sun, 2 Aug 2015 02:53:02 +0000 (12:53 +1000)
committerMario <zacjardine@y7mail.com>
Sun, 2 Aug 2015 02:53:02 +0000 (12:53 +1000)
# Conflicts:
# qcsrc/client/view.qc

1  2 
defaultXonotic.cfg
qcsrc/client/tturrets.qc
qcsrc/client/vehicles/all.qc
qcsrc/server/vehicles/racer.qc
qcsrc/server/vehicles/vehicle.qh

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge