]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'Mario/domination_roundbased'
authorMario <zacjardine@y7mail.com>
Thu, 13 Nov 2014 17:09:11 +0000 (04:09 +1100)
committerMario <zacjardine@y7mail.com>
Thu, 13 Nov 2014 17:09:11 +0000 (04:09 +1100)
1  2 
gamemodes.cfg
qcsrc/common/notifications.qh
qcsrc/server/autocvars.qh
qcsrc/server/teamplay.qc

diff --cc gamemodes.cfg
Simple merge
Simple merge
Simple merge
Simple merge