]> 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: d3203e5 f66ee3c)
Merge branch 'master' into pending-release pending-release
authorterencehill <piuntn@gmail.com>
Tue, 4 Jun 2024 12:55:25 +0000 (14:55 +0200)
committerterencehill <piuntn@gmail.com>
Tue, 4 Jun 2024 12:55:25 +0000 (14:55 +0200)
1  2 
notifications.cfg patch | diff1 | diff2 | blob | history
qcsrc/common/notifications/all.inc patch | diff1 | diff2 | blob | history
qcsrc/common/notifications/all.qh patch | diff1 | diff2 | blob | history
qcsrc/server/client.qc patch | diff1 | diff2 | blob | history

diff --cc notifications.cfg
Simple merge
diff --cc qcsrc/common/notifications/all.inc
Simple merge
diff --cc qcsrc/common/notifications/all.qh
Simple merge
diff --cc qcsrc/server/client.qc
Simple merge