]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: b9efc43 4ce40ed)
Merge remote-tracking branch 'origin/Mario/bot_fire_fix', fixes #1955
authorRudolf Polzer <divverent@xonotic.org>
Wed, 4 Jun 2014 09:18:01 +0000 (11:18 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Wed, 4 Jun 2014 09:18:01 +0000 (11:18 +0200)
* origin/Mario/bot_fire_fix:
  Frozen players shouldn't be able to burn.


Trivial merge