]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Mario/notifications
authorMario <zacjardine@y7mail.com>
Sat, 20 Dec 2014 04:48:17 +0000 (15:48 +1100)
committerMario <zacjardine@y7mail.com>
Sat, 20 Dec 2014 04:48:17 +0000 (15:48 +1100)
commita6a3b0cebd6928e3678ee4e97de4093f1b61c58b
tree671522b55729ed18016261a7a889e5cc525b41d5
parentf793281f2aba91beb14f7200ed33f1fec4d23f4e
parent90e5a408a7c967270916b7054ea6bef83f8ab2b3
Merge branch 'master' into Mario/notifications

Conflicts:
qcsrc/common/notifications.qh
qcsrc/server/command/sv_cmd.qc
qcsrc/server/mutators/gamemode_assault.qc
qcsrc/server/teamplay.qc
14 files changed:
qcsrc/common/notifications.qh
qcsrc/common/weapons/w_minelayer.qc
qcsrc/common/weapons/w_porto.qc
qcsrc/server/cl_client.qc
qcsrc/server/cl_physics.qc
qcsrc/server/command/cmd.qc
qcsrc/server/command/sv_cmd.qc
qcsrc/server/g_triggers.qc
qcsrc/server/item_key.qc
qcsrc/server/mutators/gamemode_assault.qc
qcsrc/server/mutators/gamemode_onslaught.qc
qcsrc/server/mutators/mutator_superspec.qc
qcsrc/server/t_items.qc
qcsrc/server/t_plats.qc