]> de.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: 31a5ba1 40fdc41)
Merge branch 'master' into z411/annce_queue
authorz411 <z411@omaera.org>
Wed, 2 Nov 2022 01:27:57 +0000 (22:27 -0300)
committerz411 <z411@omaera.org>
Wed, 2 Nov 2022 01:27:57 +0000 (22:27 -0300)
1  2 
qcsrc/common/notifications/all.inc patch | diff1 | diff2 | blob | history
qcsrc/common/notifications/all.qc patch | diff1 | diff2 | blob | history

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