[Commits] [wesnoth/wesnoth] b21dd2: Started showing on which difficulty levels a campa...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: b21dd2dce140c4a36155a0b333c0125f7f1d4a23
      https://github.com/wesnoth/wesnoth/commit/b21dd2dce140c4a36155a0b333c0125f7f1d4a23
  Author: Evgeny Kapun <abacabadabacaba at gmail.com>
  Date:   2015-04-20 (Mon, 20 Apr 2015)

  Changed paths:
    M changelog
    M data/gui/default/window/campaign_difficulty.cfg
    M players_changelog
    M src/game_initialization/create_engine.cpp
    M src/game_launcher.cpp
    M src/game_preferences.cpp
    M src/game_preferences.hpp
    M src/gui/dialogs/campaign_difficulty.cpp
    M src/gui/dialogs/campaign_difficulty.hpp
    M src/savegame.cpp
    M src/tests/gui/test_gui2.cpp

  Log Message:
  -----------
  Started showing on which difficulty levels a campaign was completed


  Commit: 0cd8ea545392d3c5d4552c2cb9d2d3fb520246de
      https://github.com/wesnoth/wesnoth/commit/0cd8ea545392d3c5d4552c2cb9d2d3fb520246de
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2015-06-21 (Sun, 21 Jun 2015)

  Changed paths:
    M changelog
    M data/gui/default/window/campaign_difficulty.cfg
    M players_changelog
    M src/game_initialization/create_engine.cpp
    M src/game_launcher.cpp
    M src/game_preferences.cpp
    M src/game_preferences.hpp
    M src/gui/dialogs/campaign_difficulty.cpp
    M src/gui/dialogs/campaign_difficulty.hpp
    M src/savegame.cpp
    M src/tests/gui/test_gui2.cpp

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/abacabadabacaba/wesnoth into abacabadabacaba-master

Conflicts:
	changelog
	src/game_launcher.cpp


Compare: https://github.com/wesnoth/wesnoth/compare/3d3b5103a84f...0cd8ea545392