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)
1  2 
qcsrc/common/mutators/mutator/damagetext/cl_damagetext.qc
xonotic-client.cfg

Simple merge