]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into bones_was_here/q3compat
authorbones_was_here <bones_was_here@yahoo.com.au>
Tue, 14 Jul 2020 10:44:43 +0000 (20:44 +1000)
committerbones_was_here <bones_was_here@yahoo.com.au>
Tue, 14 Jul 2020 10:44:43 +0000 (20:44 +1000)
commit328b694d6c2dfd733cb4342a1cf9d8023fa19eb7
tree1dbb0b506cc07522cb23e15f72d64a84b24b93ce
parente7f38015337aaf38c81ed3f35aa5f229c89266cc
parentcf8462819961ff010061ae862fa2602a812872c8
Merge branch 'master' into bones_was_here/q3compat
qcsrc/common/stats.qh
qcsrc/server/client.qc
qcsrc/server/compat/quake3.qc
qcsrc/server/g_world.qc
xonotic-server.cfg