Merge branch 'master' into Mario/ons_updates
authorMario <zacjardine@y7mail.com>
Tue, 18 Aug 2015 23:18:14 +0000 (09:18 +1000)
committerMario <zacjardine@y7mail.com>
Tue, 18 Aug 2015 23:18:14 +0000 (09:18 +1000)
commit34095b88e7a8d82f83aca8ce1009f9622026d159
tree636478177b88622102f56047d9b40eac82f70591
parentfc2be4c1e7547ae97301f7966333e4dc858baf92
parent4a1190b6273d8909b799314abb4f7b665b220176
Merge branch 'master' into Mario/ons_updates

# Conflicts:
# qcsrc/client/waypointsprites.qc
# qcsrc/common/constants.qh
# qcsrc/common/stats.qh
22 files changed:
defaultXonotic.cfg
gamemodes.cfg
qcsrc/client/autocvars.qh
qcsrc/client/hud.qc
qcsrc/client/hud.qh
qcsrc/client/hud_config.qc
qcsrc/client/main.qc
qcsrc/client/mapvoting.qc
qcsrc/client/progs.src
qcsrc/client/scoreboard.qc
qcsrc/client/view.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/g_damage.qc
qcsrc/server/g_world.qc
qcsrc/server/progs.src
qcsrc/server/teamplay.qc
qcsrc/server/waypointsprites.qc