[Commits] [wesnoth/wesnoth] 58d5b3: fixup includes

GitHub noreply at github.com
Wed Jun 25 14:45:14 UTC 2014 

  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 58d5b36724d14254cc6e5b0143ba59f524a34f2f
      https://github.com/wesnoth/wesnoth/commit/58d5b36724d14254cc6e5b0143ba59f524a34f2f
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-06-25 (Wed, 25 Jun 2014)

  Changed paths:
    M src/log.cpp

  Log Message:
  -----------
  fixup includes


  Commit: 6f08d885261feb3adecb57114eeaa0c942dce31a
      https://github.com/wesnoth/wesnoth/commit/6f08d885261feb3adecb57114eeaa0c942dce31a
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-06-25 (Wed, 25 Jun 2014)

  Changed paths:
    M src/unit.cpp

  Log Message:
  -----------
  fixup includes


  Commit: 39f02ae96eca3e9910e4d0bbab6402800ffa7bfc
      https://github.com/wesnoth/wesnoth/commit/39f02ae96eca3e9910e4d0bbab6402800ffa7bfc
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-06-25 (Wed, 25 Jun 2014)

  Changed paths:
    M src/scripting/lua.cpp
    M src/scripting/lua.hpp

  Log Message:
  -----------
  remove some unneeded AI headers from scripting/lua.?pp


  Commit: 67f1fc28a3033689cdea0a24256c88bbe7148033
      https://github.com/wesnoth/wesnoth/commit/67f1fc28a3033689cdea0a24256c88bbe7148033
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-06-25 (Wed, 25 Jun 2014)

  Changed paths:
    M changelog
    R data/campaigns/An_Orcish_Incursion/images/l10n/de/an-orcish-incursion-map--overlay.png
    R data/campaigns/An_Orcish_Incursion/images/l10n/es/an-orcish-incursion-map--overlay.png
    R data/campaigns/An_Orcish_Incursion/images/l10n/fr/an-orcish-incursion-map--overlay.png
    R data/campaigns/An_Orcish_Incursion/images/l10n/gd/an-orcish-incursion-map--overlay.png
    R data/campaigns/An_Orcish_Incursion/images/l10n/hu/an-orcish-incursion-map--overlay.png
    R data/campaigns/An_Orcish_Incursion/images/l10n/it/an-orcish-incursion-map--overlay.png
    R data/campaigns/An_Orcish_Incursion/images/l10n/pt/an-orcish-incursion-map--overlay.png
    R data/campaigns/An_Orcish_Incursion/images/l10n/ru/an-orcish-incursion-map--overlay.png
    R data/campaigns/An_Orcish_Incursion/images/l10n/sr/an-orcish-incursion-map--overlay.png
    R data/campaigns/An_Orcish_Incursion/images/l10n/sr at ijekavian/an-orcish-incursion-map--overlay.png
    R data/campaigns/An_Orcish_Incursion/images/l10n/sr at ijekavianlatin/an-orcish-incursion-map--overlay.png
    R data/campaigns/An_Orcish_Incursion/images/l10n/sr at latin/an-orcish-incursion-map--overlay.png
    R data/campaigns/An_Orcish_Incursion/images/l10n/zh_CN/an-orcish-incursion-map--overlay.png
    A data/campaigns/An_Orcish_Incursion/images/maps/l10n/de/aoi--overlay.png
    R data/campaigns/Dead_Water/images/l10n/fr/dead-water-map--overlay.png
    R data/campaigns/Dead_Water/images/l10n/it/dead-water-map--overlay.png
    R data/campaigns/Dead_Water/images/l10n/lt/dead-water-map--overlay.png
    R data/campaigns/Dead_Water/images/l10n/pt/dead-water-map--overlay.png
    A data/campaigns/Dead_Water/images/maps/l10n/de/dw--overlay.png
    A data/campaigns/Descent_Into_Darkness/images/maps/l10n/de/did--overlay.png
    R data/campaigns/Descent_Into_Darkness/images/misc/l10n/de/descent-into-darkness--overlay.png
    R data/campaigns/Descent_Into_Darkness/images/misc/l10n/es/descent-into-darkness--overlay.png
    R data/campaigns/Descent_Into_Darkness/images/misc/l10n/fr/descent-into-darkness--overlay.png
    R data/campaigns/Descent_Into_Darkness/images/misc/l10n/hu/descent-into-darkness--overlay.png
    R data/campaigns/Descent_Into_Darkness/images/misc/l10n/it/descent-into-darkness--overlay.png
    R data/campaigns/Descent_Into_Darkness/images/misc/l10n/pt/descent-into-darkness--overlay.png
    R data/campaigns/Descent_Into_Darkness/images/misc/l10n/sr/descent-into-darkness--overlay.png
    R data/campaigns/Descent_Into_Darkness/images/misc/l10n/sr at ijekavian/descent-into-darkness--overlay.png
    R data/campaigns/Descent_Into_Darkness/images/misc/l10n/sr at ijekavianlatin/descent-into-darkness--overlay.png
    R data/campaigns/Descent_Into_Darkness/images/misc/l10n/sr at latin/descent-into-darkness--overlay.png
    R data/campaigns/Descent_Into_Darkness/images/misc/l10n/zh_CN/descent-into-darkness--overlay.png
    R data/campaigns/Eastern_Invasion/images/l10n/de/eastern-invasion-map--overlay.png
    R data/campaigns/Eastern_Invasion/images/l10n/es/eastern-invasion-map--overlay.png
    R data/campaigns/Eastern_Invasion/images/l10n/fr/eastern-invasion-map--overlay.png
    R data/campaigns/Eastern_Invasion/images/l10n/gl/eastern-invasion-map--overlay.png
    R data/campaigns/Eastern_Invasion/images/l10n/hu/eastern-invasion-map--overlay.png
    R data/campaigns/Eastern_Invasion/images/l10n/it/eastern-invasion-map--overlay.png
    R data/campaigns/Eastern_Invasion/images/l10n/lt/eastern-invasion-map--overlay.png
    R data/campaigns/Eastern_Invasion/images/l10n/pt/eastern-invasion-map--overlay.png
    R data/campaigns/Eastern_Invasion/images/l10n/sr/eastern-invasion-map--overlay.png
    R data/campaigns/Eastern_Invasion/images/l10n/sr at ijekavian/eastern-invasion-map--overlay.png
    R data/campaigns/Eastern_Invasion/images/l10n/sr at ijekavianlatin/eastern-invasion-map--overlay.png
    R data/campaigns/Eastern_Invasion/images/l10n/sr at latin/eastern-invasion-map--overlay.png
    R data/campaigns/Eastern_Invasion/images/l10n/zh_CN/eastern-invasion-map--overlay.png
    A data/campaigns/Eastern_Invasion/images/maps/l10n/de/ei--overlay.png
    A data/campaigns/Heir_To_The_Throne/images/maps/l10n/de/httt--overlay.png
    R data/campaigns/Legend_of_Wesmere/images/l10n/de/legend-of-wesmere-map--overlay.png
    R data/campaigns/Legend_of_Wesmere/images/l10n/es/legend-of-wesmere-map--overlay.png
    R data/campaigns/Legend_of_Wesmere/images/l10n/fr/legend-of-wesmere-map--overlay.png
    R data/campaigns/Legend_of_Wesmere/images/l10n/gl/legend-of-wesmere-map--overlay.png
    R data/campaigns/Legend_of_Wesmere/images/l10n/hu/legend-of-wesmere-map--overlay.png
    R data/campaigns/Legend_of_Wesmere/images/l10n/it/legend-of-wesmere-map--overlay.png
    A data/campaigns/Legend_of_Wesmere/images/l10n/low-map--overlay.png
    R data/campaigns/Legend_of_Wesmere/images/l10n/lt/legend-of-wesmere-map--overlay.png
    R data/campaigns/Legend_of_Wesmere/images/l10n/pt/legend-of-wesmere-map--overlay.png
    R data/campaigns/Legend_of_Wesmere/images/l10n/sr/legend-of-wesmere-map--overlay.png
    R data/campaigns/Legend_of_Wesmere/images/l10n/sr at ijekavian/legend-of-wesmere-map--overlay.png
    R data/campaigns/Legend_of_Wesmere/images/l10n/sr at ijekavianlatin/legend-of-wesmere-map--overlay.png
    R data/campaigns/Legend_of_Wesmere/images/l10n/sr at latin/legend-of-wesmere-map--overlay.png
    R data/campaigns/Legend_of_Wesmere/images/l10n/zh_CN/legend-of-wesmere-map--overlay.png
    A data/campaigns/Liberty/images/maps/l10n/de/liberty--overlay.png
    R data/campaigns/Liberty/images/maps/l10n/de/liberty-map--overlay.png
    R data/campaigns/Liberty/images/maps/l10n/es/liberty-map--overlay.png
    R data/campaigns/Liberty/images/maps/l10n/fr/liberty-map--overlay.png
    R data/campaigns/Liberty/images/maps/l10n/hu/liberty-map--overlay.png
    R data/campaigns/Liberty/images/maps/l10n/it/liberty-map--overlay.png
    R data/campaigns/Liberty/images/maps/l10n/lt/liberty-map--overlay.png
    R data/campaigns/Liberty/images/maps/l10n/sr/liberty-map--overlay.png
    R data/campaigns/Liberty/images/maps/l10n/sr at ijekavian/liberty-map--overlay.png
    R data/campaigns/Liberty/images/maps/l10n/sr at ijekavianlatin/liberty-map--overlay.png
    R data/campaigns/Liberty/images/maps/l10n/sr at latin/liberty-map--overlay.png
    R data/campaigns/Liberty/images/maps/l10n/zh_CN/liberty-map--overlay.png
    A data/campaigns/Sceptre_of_Fire/images/maps/l10n/de/sof--overlay.png
    R data/campaigns/Son_Of_The_Black_Eye/images/l10n/fr/farnorth--overlay.png
    R data/campaigns/Son_Of_The_Black_Eye/images/l10n/hu/farnorth.png
    R data/campaigns/Son_Of_The_Black_Eye/images/l10n/it/farnorth--overlay.png
    R data/campaigns/Son_Of_The_Black_Eye/images/l10n/pt/farnorth--overlay.png
    R data/campaigns/Son_Of_The_Black_Eye/images/l10n/ru/farnorth--overlay.png
    R data/campaigns/Son_Of_The_Black_Eye/images/l10n/sr/farnorth--overlay.png
    R data/campaigns/Son_Of_The_Black_Eye/images/l10n/sr at ijekavian/farnorth--overlay.png
    R data/campaigns/Son_Of_The_Black_Eye/images/l10n/sr at ijekavianlatin/farnorth--overlay.png
    R data/campaigns/Son_Of_The_Black_Eye/images/l10n/sr at latin/farnorth--overlay.png
    A data/campaigns/Son_Of_The_Black_Eye/images/maps/l10n/de/sotbe--overlay.png
    A data/campaigns/The_Rise_Of_Wesnoth/images/maps/l10n/de/green_isle--overlay.png
    R data/campaigns/The_Rise_Of_Wesnoth/images/story/l10n/fr/east.png
    R data/campaigns/The_Rise_Of_Wesnoth/images/story/l10n/fr/tgi-blackmore.png
    R data/campaigns/The_Rise_Of_Wesnoth/images/story/l10n/fr/tgi-clearwater.png
    R data/campaigns/The_Rise_Of_Wesnoth/images/story/l10n/fr/tgi-jevyan.png
    R data/campaigns/The_Rise_Of_Wesnoth/images/story/l10n/fr/tgi-southbay.png
    R data/campaigns/The_Rise_Of_Wesnoth/images/story/l10n/fr/tgi-stormvale.png
    R data/campaigns/The_Rise_Of_Wesnoth/images/story/l10n/fr/tgi-thegreenisle.png
    R data/campaigns/The_Rise_Of_Wesnoth/images/story/l10n/fr/west.png
    R data/campaigns/The_Rise_Of_Wesnoth/images/story/l10n/gl/east.png
    R data/campaigns/The_Rise_Of_Wesnoth/images/story/l10n/gl/tgi-blackmore.png
    R data/campaigns/The_Rise_Of_Wesnoth/images/story/l10n/gl/tgi-clearwater.png
    R data/campaigns/The_Rise_Of_Wesnoth/images/story/l10n/gl/tgi-jevyan.png
    R data/campaigns/The_Rise_Of_Wesnoth/images/story/l10n/gl/tgi-southbay.png
    R data/campaigns/The_Rise_Of_Wesnoth/images/story/l10n/gl/tgi-stormvale.png
    R data/campaigns/The_Rise_Of_Wesnoth/images/story/l10n/gl/tgi-thegreenisle.png
    R data/campaigns/The_Rise_Of_Wesnoth/images/story/l10n/gl/west.png
    R data/campaigns/The_Rise_Of_Wesnoth/images/story/l10n/hu/east.png
    R data/campaigns/The_Rise_Of_Wesnoth/images/story/l10n/hu/tgi-clearwater.png
    R data/campaigns/The_Rise_Of_Wesnoth/images/story/l10n/hu/tgi-southbay.png
    R data/campaigns/The_Rise_Of_Wesnoth/images/story/l10n/hu/tgi-thegreenisle.png
    R data/campaigns/The_Rise_Of_Wesnoth/images/story/l10n/hu/west.png
    R data/campaigns/The_Rise_Of_Wesnoth/images/story/l10n/pt/east.png
    R data/campaigns/The_Rise_Of_Wesnoth/images/story/l10n/pt/tgi-blackmore.png
    R data/campaigns/The_Rise_Of_Wesnoth/images/story/l10n/pt/tgi-clearwater.png
    R data/campaigns/The_Rise_Of_Wesnoth/images/story/l10n/pt/tgi-jevyan.png
    R data/campaigns/The_Rise_Of_Wesnoth/images/story/l10n/pt/tgi-southbay.png
    R data/campaigns/The_Rise_Of_Wesnoth/images/story/l10n/pt/tgi-stormvale.png
    R data/campaigns/The_Rise_Of_Wesnoth/images/story/l10n/pt/tgi-thegreenisle.png
    R data/campaigns/The_Rise_Of_Wesnoth/images/story/l10n/pt/west.png
    A data/campaigns/The_South_Guard/images/maps/l10n/de/tsg--overlay.png
    M data/core/about.cfg
    A data/core/images/maps/l10n/de/titlescreen--overlay.png
    M data/multiplayer/scenarios/2p_Dark_Forecast.cfg
    M data/multiplayer/scenarios/2p_Hornshark_Island.cfg
    M data/multiplayer/scenarios/4p_A_New_Land.cfg
    M data/multiplayer/scenarios/6p_Team_Survival.cfg
    M data/tools/GUI.pyw
    M data/tools/README
    M l10n-track
    M players_changelog
    M po/wesnoth-ai/vi.po
    M po/wesnoth-dw/pl.po
    M po/wesnoth-editor/vi.po
    M po/wesnoth-ei/de.po
    M po/wesnoth-ei/pl.po
    M po/wesnoth-ei/vi.po
    M po/wesnoth-help/vi.po
    M po/wesnoth-httt/de.po
    M po/wesnoth-httt/pl.po
    M po/wesnoth-httt/vi.po
    M po/wesnoth-lib/vi.po
    M po/wesnoth-low/pl.po
    M po/wesnoth-low/vi.po
    M po/wesnoth-manpages/vi.po
    M po/wesnoth-manual/vi.po
    M po/wesnoth-multiplayer/vi.po
    M po/wesnoth-nr/vi.po
    M po/wesnoth-sotbe/vi.po
    M po/wesnoth-tb/pl.po
    M po/wesnoth-trow/de.po
    M po/wesnoth-trow/pl.po
    M po/wesnoth-trow/vi.po
    M po/wesnoth-units/vi.po
    M po/wesnoth-utbs/vi.po
    M po/wesnoth/vi.po
    M projectfiles/Xcode/Wesnoth.xcodeproj/project.pbxproj
    M src/game_classification.cpp
    M src/game_classification.hpp
    M src/game_config_manager.cpp
    M src/multiplayer.cpp
    M src/multiplayer_create.cpp
    M src/multiplayer_create_engine.cpp
    M src/multiplayer_create_engine.hpp
    M src/multiplayer_wait.cpp
    M src/unit.cpp

  Log Message:
  -----------
  Merge branch 'master' of git://github.com/wesnoth/wesnoth

Conflicts:
	src/unit.cpp

Header conflict


Compare: https://github.com/wesnoth/wesnoth/compare/e47e66e67272...67f1fc28a303

More information about the Commits mailing list