Merge branch 'terencehill/notification_cvars'
authorMario <zacjardine@y7mail.com>
Fri, 28 Nov 2014 00:33:53 +0000 (11:33 +1100)
committerMario <zacjardine@y7mail.com>
Fri, 28 Nov 2014 00:33:53 +0000 (11:33 +1100)
commit06953d7d1a40e2ee6dd389ae50b20ef9c7f75557
treeae9f1a4a90af47fc6da552517bf45056dc8744ad
parentf183059a6e71a2aa69a9bb3490305b81a267fe45
parent5ef73b06fe1ba3805d8fc5b58a27a52627f53671
Merge branch 'terencehill/notification_cvars'

Conflicts:
notifications.cfg
qcsrc/common/notifications.qc