[Commits] [wesnoth/wesnoth] 7db452: Simplify config::merge_children_by_attribute

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 7db4527b0f8cb23eef88a8e498d09dc53f525bec
      https://github.com/wesnoth/wesnoth/commit/7db4527b0f8cb23eef88a8e498d09dc53f525bec
  Author: Celtic Minstrel <celtic.minstrel.ca at gmail.com>
  Date:   2016-09-06 (Tue, 06 Sep 2016)

  Changed paths:
    M src/config.cpp

  Log Message:
  -----------
  Simplify config::merge_children_by_attribute


  Commit: be7670bea580d07087d1cd52aca384c1e355c1f1
      https://github.com/wesnoth/wesnoth/commit/be7670bea580d07087d1cd52aca384c1e355c1f1
  Author: Celtic Minstrel <celtic.minstrel.ca at gmail.com>
  Date:   2016-09-06 (Tue, 06 Sep 2016)

  Changed paths:
    M src/ai/manager.cpp

  Log Message:
  -----------
  Fix [modify_side][ai] again

A logic error caused any added aspects to be mixed together with
existing aspects if it was executed before the AI had been initialized.
This is the cause of the unknown aspect warnings from
GregoryLundberg/wesnoth#28


Compare: https://github.com/wesnoth/wesnoth/compare/717aa892d2e5...be7670bea580