]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Mario/combined_updates
authorMario <zacjardine@y7mail.com>
Sat, 18 Apr 2015 05:06:41 +0000 (15:06 +1000)
committerMario <zacjardine@y7mail.com>
Sat, 18 Apr 2015 05:06:41 +0000 (15:06 +1000)
commit73c7180e8ac9e84aa57b6ed2be594ec6aa3ae13e
treebdf0ccdeb25103d1c2341d0ce300d54a6efc09ba
parentc96a3fbcade5fce06e5b76089e0ff08d12e592ea
parent07363585c6bb3da68f60445673e99de355c86807
Merge branch 'master' into Mario/combined_updates

Conflicts:
qcsrc/client/tturrets.qc
qcsrc/common/weapons/w_arc.qc
qcsrc/server/tturrets/system/system_main.qc
qcsrc/server/vehicles/vehicles.qc
qcsrc/client/hud.qc
qcsrc/client/hud_config.qc
qcsrc/client/main.qc
qcsrc/common/notifications.qc
qcsrc/common/turrets/turrets.qc
qcsrc/common/weapons/w_arc.qc
qcsrc/common/weapons/w_devastator.qc
qcsrc/common/weapons/w_hagar.qc