]> 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: 0692765 8b439c5)
Merge branch 'z411/bai-server' into LegendaryGuard/bai_mod
authorLegendaryGuard <rootuser999@gmail.com>
Sun, 4 Apr 2021 19:32:45 +0000 (21:32 +0200)
committerLegendaryGuard <rootuser999@gmail.com>
Sun, 4 Apr 2021 19:32:45 +0000 (21:32 +0200)
1  2 
qcsrc/common/notifications/all.inc patch | diff1 | diff2 | blob | history
qcsrc/server/world.qc patch | diff1 | diff2 | blob | history

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