]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into z411/bai-server
authorz411 <z411@omaera.org>
Sun, 5 Dec 2021 02:10:16 +0000 (23:10 -0300)
committerz411 <z411@omaera.org>
Sun, 5 Dec 2021 02:10:16 +0000 (23:10 -0300)
commit89ae8658d48e0a4be5e652004317bca5717b04fa
tree6d86d2b0aa504ba66a98deae06c055c301c2b241
parentd0f4977529582c7363918d09db7005fe2af4fa4c
parentcb8c9f9915bdaff154b2cf3d757c3b3bcbcbaa1c
Merge branch 'master' into z411/bai-server
qcsrc/server/items/items.qc
qcsrc/server/world.qc