]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
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)
1  2 
defaultXonotic.cfg
qcsrc/common/mutators/mutator/damagetext/damagetext.qc

Simple merge