Merge branch 'master' into Mario/ons_updates
authorMario <zacjardine@y7mail.com>
Tue, 3 Feb 2015 05:27:17 +0000 (16:27 +1100)
committerMario <zacjardine@y7mail.com>
Tue, 3 Feb 2015 05:27:17 +0000 (16:27 +1100)
commit15a18e8ca7c55ac8187b9ea266d15c2d6e0cb869
tree987614b24bd224acdfcd995c245d948ed9267dbf
parente80962600618cee1bb882cf785a2f3011466e12c
parentb4a0a5ea0f964c0a88877d1903580684ce73f307
Merge branch 'master' into Mario/ons_updates

Conflicts:
qcsrc/client/autocvars.qh
qcsrc/client/hud.qh
qcsrc/client/mapvoting.qc
qcsrc/client/progs.src
qcsrc/client/view.qc
qcsrc/client/waypointsprites.qc
qcsrc/client/waypointsprites.qh
qcsrc/common/constants.qh
qcsrc/common/mapinfo.qh
qcsrc/common/stats.qh
qcsrc/server/autocvars.qh
qcsrc/server/miscfunctions.qc
qcsrc/server/mutators/gamemode_onslaught.qc
qcsrc/server/progs.src
38 files changed:
defaultXonotic.cfg
qcsrc/client/autocvars.qh
qcsrc/client/command/cl_cmd.qc
qcsrc/client/controlpoint.qc
qcsrc/client/controlpoint.qh
qcsrc/client/generator.qc
qcsrc/client/generator.qh
qcsrc/client/hud.qc
qcsrc/client/hud.qh
qcsrc/client/main.qc
qcsrc/client/main.qh
qcsrc/client/progs.src
qcsrc/client/scoreboard.qc
qcsrc/client/teamradar.qc
qcsrc/client/teamradar.qh
qcsrc/client/view.qc
qcsrc/client/waypointsprites.qc
qcsrc/client/waypointsprites.qh
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/controlpoint.qc
qcsrc/server/controlpoint.qh
qcsrc/server/g_damage.qc
qcsrc/server/g_world.qc
qcsrc/server/generator.qc
qcsrc/server/generator.qh
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
qcsrc/server/waypointsprites.qc