]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f593f09 481d8ee)
Merge branch 'master' into terencehill/lms_spec
authorterencehill <piuntn@gmail.com>
Tue, 7 Mar 2023 15:36:43 +0000 (16:36 +0100)
committerterencehill <piuntn@gmail.com>
Tue, 7 Mar 2023 15:36:43 +0000 (16:36 +0100)
1  2 
notifications.cfg patch | diff1 | diff2 | blob | history
qcsrc/common/gamemodes/gamemode/lms/sv_lms.qc patch | diff1 | diff2 | blob | history
qcsrc/common/notifications/all.inc patch | diff1 | diff2 | blob | history

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