]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
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)
commitdfef328835ce6ec326a4b3ed0ecbb19845352f89
tree16179bd0cf4d72ba5e6999c0b839a943e93cda1e
parent1e4ff5261680a580f0ae39d2fc19288ef2a4f602
parentb32eb7b11a27ac13f205b13ece8e633b2e9c423c
Merge branch 'master' into martin-t/damagetext
qcsrc/common/mutators/mutator/damagetext/damagetext.qc
qcsrc/server/mutators/events.qh