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)
commit815bcc74c7f64dcb4a3ad63f40a844706743f682
tree5cea2c427cb2972dc42a41278120b022108a1510
parent83cd018ca2adbbf7296e83f28e80e8723586eebc
parentbabbc5b935003b07e5fdc6adb18f9d4bc37dfed3
Merge branch 'master' into martin-t/available
qcsrc/server/g_world.qc