]> 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: 7c6b1d3 42049bc)
Merge remote-tracking branch 'origin/drjaska/chat-format' into morosophos/server...
authorNick S <nick@teichisma.info>
Thu, 11 May 2023 12:14:39 +0000 (15:14 +0300)
committerNick S <nick@teichisma.info>
Thu, 11 May 2023 12:14:39 +0000 (15:14 +0300)
1  2 
qcsrc/server/main.qc patch | diff1 | diff2 | blob | history
xonotic-server.cfg patch | diff1 | diff2 | blob | history

diff --cc qcsrc/server/main.qc
Simple merge
diff --cc xonotic-server.cfg
Simple merge