]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f183059 5ef73b0)
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)
Conflicts:
notifications.cfg

1  2 
qcsrc/common/notifications.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/common/notifications.qc
Simple merge