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)
commitd9b16a719396d1afe1a767dd35e8cc5de779a22d
treef1886d796b8b3bb3b4af142a8ad35e0f47af4375
parent37b793f7b1da9a3ea5aa86ae422342f596f609e4
parent09616f413d96c0436c5129cbcf78d95163fc1640
Merge branch 'master' into sev/luma_hud_vehicles

# Conflicts:
# qcsrc/client/view.qc
defaultXonotic.cfg
qcsrc/client/tturrets.qc
qcsrc/client/vehicles/all.qc
qcsrc/server/vehicles/racer.qc
qcsrc/server/vehicles/vehicle.qh