Merge branch 'master' into martin-t/available 699/head
authorMartin Taibr <taibr.martin@gmail.com>
Wed, 28 Aug 2019 16:18:50 +0000 (18:18 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Wed, 28 Aug 2019 16:18:50 +0000 (18:18 +0200)
1  2 
qcsrc/server/g_world.qc

Simple merge