]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
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)
1  2 
qcsrc/common/stats.qh
qcsrc/server/client.qc
qcsrc/server/compat/quake3.qc
qcsrc/server/g_world.qc
xonotic-server.cfg

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge