Merge branch 'master' into martin-t/damagetext
authorMartin Taibr <taibr.martin@gmail.com>
Sun, 19 Feb 2017 12:44:54 +0000 (13:44 +0100)
committerMartin Taibr <taibr.martin@gmail.com>
Sun, 19 Feb 2017 12:44:54 +0000 (13:44 +0100)
commitb834eab77489d98d5d722d67c8a96cf6c3549436
treeac33e7c7d6dfe3b6dcebc44ef40e07611d2e15a3
parent557b416febb74c7adc3216357529e20d27b42e5a
parent1abcc79832716e25079f9c77cff0b1dcfecde14b
Merge branch 'master' into martin-t/damagetext
defaultXonotic.cfg
qcsrc/common/mutators/mutator/damagetext/damagetext.qc