]> 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: d2542e8 71e1f91)
Merge remote-tracking branch 'origin/master' into morosophos/server-current4
authorNikolay S <nick@teichisma.info>
Mon, 2 Oct 2023 14:14:51 +0000 (17:14 +0300)
committerNikolay S <nick@teichisma.info>
Mon, 2 Oct 2023 14:14:51 +0000 (17:14 +0300)
1  2 
qcsrc/common/stats.qh patch | diff1 | diff2 | blob | history
xonotic-server.cfg patch | diff1 | diff2 | blob | history

diff --cc qcsrc/common/stats.qh
Simple merge
diff --cc xonotic-server.cfg
Simple merge