]> 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, 11 Sep 2016 01:07:41 +0000 (03:07 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Sun, 11 Sep 2016 01:07:41 +0000 (03:07 +0200)
1  2 
qcsrc/common/mutators/mutator/damagetext/damagetext.qc
qcsrc/server/mutators/events.qh

Simple merge