]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote-tracking branch 'origin/master' into morosophos/server-current4
authorNikolay S. <nick@teichisma.info>
Sat, 9 Dec 2023 13:09:37 +0000 (15:09 +0200)
committerNikolay S. <nick@teichisma.info>
Sat, 9 Dec 2023 13:09:37 +0000 (15:09 +0200)
commit8d4841fa2fd7207fe350098b5db52e5e879fbcb5
tree60be35c326b7479dfe5f32b41f0eec97a4ca2a3f
parent3a07f3668e65e73ed6ba577573cbb582868608db
parent760e1bb5c7f4727ab4127bba4d529fbe7e787579
Merge remote-tracking branch 'origin/master' into morosophos/server-current4
qcsrc/server/compat/quake3.qc
qcsrc/server/damage.qc
qcsrc/server/main.qc
xonotic-server.cfg