]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d159d68 7a099e0)
Merge remote-tracking branch 'origin/Mario/frozen_mines'
authorRudolf Polzer <divverent@xonotic.org>
Wed, 4 Jun 2014 09:10:35 +0000 (11:10 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Wed, 4 Jun 2014 09:10:35 +0000 (11:10 +0200)
* origin/Mario/frozen_mines:
  Detonate mines if owner becomes frozen, don't auto detonate mines if the enemy is frozen


Trivial merge