Merge remote-tracking branch 'origin/master' into samual/notification_rewrite
authorSamual Lenks <samual@xonotic.org>
Wed, 13 Feb 2013 17:09:46 +0000 (12:09 -0500)
committerSamual Lenks <samual@xonotic.org>
Wed, 13 Feb 2013 17:09:46 +0000 (12:09 -0500)
commit54f4843b201d2b22942457df5b50ddc0c48ed8d2
tree974f593f168e51382ea8569a626c88264315c8c1
parente7c63b4a159ba5bed1a4e35d1df9ca19cdef95a2
parent7db04867a8db785347bec7d49890c0e70a0df2bc
Merge remote-tracking branch 'origin/master' into samual/notification_rewrite

Conflicts:
qcsrc/client/hud.qc
qcsrc/common/constants.qh
qcsrc/server/vehicles/spiderbot.qc
qcsrc/server/w_fireball.qc
qcsrc/server/w_rifle.qc
qcsrc/server/w_tuba.qc
23 files changed:
defaultXonotic.cfg
qcsrc/client/Main.qc
qcsrc/client/csqcmodel_hooks.qc
qcsrc/client/hook.qc
qcsrc/client/miscfunctions.qc
qcsrc/client/waypointsprites.qc
qcsrc/common/deathtypes.qh
qcsrc/common/notifications.qh
qcsrc/server/autocvars.qh
qcsrc/server/cl_client.qc
qcsrc/server/cl_player.qc
qcsrc/server/defs.qh
qcsrc/server/g_damage.qc
qcsrc/server/g_world.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/vehicles/spiderbot.qc
qcsrc/server/w_fireball.qc
qcsrc/server/w_minstanex.qc
qcsrc/server/w_rifle.qc
qcsrc/server/w_seeker.qc
qcsrc/server/w_shotgun.qc
qcsrc/server/w_tuba.qc
qcsrc/server/w_uzi.qc