Merge branch 'master' into martin-t/dmgtext
authorterencehill <piuntn@gmail.com>
Thu, 1 Nov 2018 14:25:19 +0000 (15:25 +0100)
committerterencehill <piuntn@gmail.com>
Thu, 1 Nov 2018 14:25:19 +0000 (15:25 +0100)
commit62d736d8c3a51baf5fa3a4265e39a2b773704a91
tree9e54a7e168f88ad7365feb4e341da8faae6bb00b
parent59845bcb06720efc1f30ffbf550f7e04a4c51fcd
parentca48b1e339d35a75bb0e3540e8b570f74b084bf4
Merge branch 'master' into martin-t/dmgtext
qcsrc/common/mutators/mutator/damagetext/cl_damagetext.qc
xonotic-client.cfg