]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
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)
commit5379cc3dcc6a4a8278622516885096177c2c2a35
treed01c52fd39f97328b0d2c185a224a9ce4db63301
parentd159d68eea046ca027b7260634c63ba40f943633
parent7a099e0cf0295f0ce3c0bae24a7988c416b77c80
Merge remote-tracking branch 'origin/Mario/frozen_mines'

* origin/Mario/frozen_mines:
  Detonate mines if owner becomes frozen, don't auto detonate mines if the enemy is frozen