[Warzone2100-commits] [Warzone2100/warzone2100] a10dc9: Don't clear chat on setting structure limits.

[Cyp <cy...@wz...>]

  Branch: refs/heads/master
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: a10dc950080ec4ad757591f644afe1d2e917f74c
      https://github.com/Warzone2100/warzone2100/commit/a10dc950080ec4ad757591f644afe1d2e917f74c
  Author: Cyp <cy...@wz...>
  Date:   2016-06-25 (Sat, 25 Jun 2016)

  Changed paths:
    M src/frontend.cpp
    M src/multiint.cpp

  Log Message:
  -----------
  Don't clear chat on setting structure limits.

Fixes ticket:4276.


  Commit: fdf4c7a17748ef1583b9a6804e3974276eea5452
      https://github.com/Warzone2100/warzone2100/commit/fdf4c7a17748ef1583b9a6804e3974276eea5452
  Author: Cyp <cy...@wz...>
  Date:   2016-07-02 (Sat, 02 Jul 2016)

  Changed paths:
    A data/mp/multiplay/skirmish/nb_common/standard_build_order.js
    A data/mp/multiplay/skirmish/nb_generic.js
    A data/mp/multiplay/skirmish/nb_generic.json
    A data/mp/multiplay/skirmish/nb_hover.js
    A data/mp/multiplay/skirmish/nb_hover.json
    A data/mp/multiplay/skirmish/nb_includes/_events.js
    A data/mp/multiplay/skirmish/nb_includes/_head.js
    A data/mp/multiplay/skirmish/nb_includes/_main.js
    A data/mp/multiplay/skirmish/nb_includes/adapt.js
    A data/mp/multiplay/skirmish/nb_includes/build.js
    A data/mp/multiplay/skirmish/nb_includes/chat.js
    A data/mp/multiplay/skirmish/nb_includes/intensity.js
    A data/mp/multiplay/skirmish/nb_includes/lassat.js
    A data/mp/multiplay/skirmish/nb_includes/math.js
    A data/mp/multiplay/skirmish/nb_includes/misc.js
    A data/mp/multiplay/skirmish/nb_includes/produce.js
    A data/mp/multiplay/skirmish/nb_includes/research.js
    A data/mp/multiplay/skirmish/nb_includes/stats.js
    A data/mp/multiplay/skirmish/nb_includes/tactics.js
    A data/mp/multiplay/skirmish/nb_includes/timers.js
    A data/mp/multiplay/skirmish/nb_rulesets/standard.js
    A data/mp/multiplay/skirmish/nb_turtle.js
    A data/mp/multiplay/skirmish/nb_turtle.json
    R data/mp/multiplay/skirmish/nullbot-generic.js.inc
    R data/mp/multiplay/skirmish/nullbot-header.js.inc
    R data/mp/multiplay/skirmish/nullbot-hover.js
    R data/mp/multiplay/skirmish/nullbot-hover.js.inc
    R data/mp/multiplay/skirmish/nullbot-hover.json
    R data/mp/multiplay/skirmish/nullbot-main.js.inc
    R data/mp/multiplay/skirmish/nullbot-turtle.js
    R data/mp/multiplay/skirmish/nullbot-turtle.js.inc
    R data/mp/multiplay/skirmish/nullbot-turtle.json
    R data/mp/multiplay/skirmish/nullbot.js
    R data/mp/multiplay/skirmish/nullbot.json

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master'


  Commit: 5647586af6182ab391021c9874277b3ae28e56d1
      https://github.com/Warzone2100/warzone2100/commit/5647586af6182ab391021c9874277b3ae28e56d1
  Author: Cyp <cy...@wz...>
  Date:   2016-07-02 (Sat, 02 Jul 2016)

  Changed paths:
    M po/POTFILES.in

  Log Message:
  -----------
  Update POTFILES.in to match new NullBot version.


Compare: https://github.com/Warzone2100/warzone2100/compare/11ef36281652...5647586af618