]> 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: 8443546 11e4894)
Merge branch 'master' into LegendaryGuard/armorizing_and_dark_nades
authorLegendaryGuard <rootuser999@gmail.com>
Wed, 17 Aug 2022 20:43:48 +0000 (22:43 +0200)
committerLegendaryGuard <rootuser999@gmail.com>
Wed, 17 Aug 2022 20:43:48 +0000 (22:43 +0200)
1  2 
notifications.cfg patch | diff1 | diff2 | blob | history
qcsrc/client/main.qc patch | diff1 | diff2 | blob | history
qcsrc/common/notifications/all.inc patch | diff1 | diff2 | blob | history
qcsrc/server/client.qh patch | diff1 | diff2 | blob | history

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