]> 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: 38b5fc5 59d3684)
Merge branch 'master' into Mario/survival
authorMario <mario.mario@y7mail.com>
Mon, 27 Jul 2020 03:25:32 +0000 (13:25 +1000)
committerMario <mario.mario@y7mail.com>
Mon, 27 Jul 2020 03:25:32 +0000 (13:25 +1000)
1  2 
gamemodes-server.cfg patch | diff1 | diff2 | blob | history
notifications.cfg patch | diff1 | diff2 | blob | history
qcsrc/common/notifications/all.inc patch | diff1 | diff2 | blob | history

diff --cc gamemodes-server.cfg
Simple merge
diff --cc notifications.cfg
Simple merge
diff --cc qcsrc/common/notifications/all.inc
Simple merge