Merge branch 'master' into Mario/ons_updates
authorMario <zacjardine@y7mail.com>
Tue, 20 Jan 2015 02:40:00 +0000 (13:40 +1100)
committerMario <zacjardine@y7mail.com>
Tue, 20 Jan 2015 02:40:00 +0000 (13:40 +1100)
commite80962600618cee1bb882cf785a2f3011466e12c
treec484b68abb44d5e720a6f4b558146e0a6b4c8a2f
parent5091a7dc144aa6a2c50573d9e84d4af16101b2d2
parent4c3cf7efc863be994bad18a855c771c0d1ded098
Merge branch 'master' into Mario/ons_updates

Conflicts:
qcsrc/client/View.qc
qcsrc/client/scoreboard.qc
qcsrc/common/constants.qh
qcsrc/common/mapinfo.qh
qcsrc/common/notifications.qh
qcsrc/server/autocvars.qh
qcsrc/server/bot/havocbot/roles.qc
qcsrc/server/g_damage.qc
qcsrc/server/mutators/gamemode_onslaught.qc
qcsrc/server/progs.src
26 files changed:
defaultXonotic.cfg
gamemodes.cfg
qcsrc/client/Main.qc
qcsrc/client/View.qc
qcsrc/client/autocvars.qh
qcsrc/client/hud.qc
qcsrc/client/hud.qh
qcsrc/client/mapvoting.qc
qcsrc/client/progs.src
qcsrc/client/scoreboard.qc
qcsrc/client/waypointsprites.qc
qcsrc/common/constants.qh
qcsrc/common/mapinfo.qh
qcsrc/common/notifications.qh
qcsrc/common/stats.qh
qcsrc/server/autocvars.qh
qcsrc/server/bot/havocbot/havocbot.qc
qcsrc/server/bot/havocbot/roles.qc
qcsrc/server/g_damage.qc
qcsrc/server/g_world.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/mutators/gamemode_onslaught.qc
qcsrc/server/mutators/gamemode_onslaught.qh
qcsrc/server/mutators/mutators_include.qh
qcsrc/server/progs.src
qcsrc/server/teamplay.qc