[Commits] [wesnoth/wesnoth] 7960e4: Fix SDL2 compilation with scons

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 7960e4746ff7eca61288eaa72b38e9a8f11bad11
      https://github.com/wesnoth/wesnoth/commit/7960e4746ff7eca61288eaa72b38e9a8f11bad11
  Author: Alexander van Gessel <ai0867 at gmail.com>
  Date:   2014-06-11 (Wed, 11 Jun 2014)

  Changed paths:
    M SConstruct
    M src/SConscript

  Log Message:
  -----------
  Fix SDL2 compilation with scons


  Commit: 8edbae98767838f9fbc9deea4aac51a9484f42c9
      https://github.com/wesnoth/wesnoth/commit/8edbae98767838f9fbc9deea4aac51a9484f42c9
  Author: Alexander van Gessel <ai0867 at gmail.com>
  Date:   2014-06-12 (Thu, 12 Jun 2014)

  Changed paths:
    M src/video.cpp

  Log Message:
  -----------
  Don't offer resolutions below the minimum size


  Commit: c7d8f5654d4752bd6391b724e4ba9bbaa932e491
      https://github.com/wesnoth/wesnoth/commit/c7d8f5654d4752bd6391b724e4ba9bbaa932e491
  Author: Alexander van Gessel <ai0867 at gmail.com>
  Date:   2014-06-12 (Thu, 12 Jun 2014)

  Changed paths:
    M src/video.cpp

  Log Message:
  -----------
  Always show the minimum resolution


  Commit: 392ef8b1bd51d9957640126d87d419668fb72094
      https://github.com/wesnoth/wesnoth/commit/392ef8b1bd51d9957640126d87d419668fb72094
  Author: Alexander van Gessel <ai0867 at gmail.com>
  Date:   2014-06-12 (Thu, 12 Jun 2014)

  Changed paths:
    M changelog
    M data/gui/default/window/chat_log.cfg
    M data/tools/wesnoth_addon_manager
    M players_changelog
    M projectfiles/CodeBlocks/wesnoth.cbp
    M projectfiles/VC9/wesnoth.vcproj
    M src/campaign_server/campaign_server.cpp
    M src/game_board.cpp
    M src/game_board.hpp
    M src/game_controller.cpp
    M src/gui/dialogs/chat_log.cpp
    M src/image.cpp
    M src/image.hpp
    M src/loadscreen.cpp
    M src/map.cpp
    M src/map.hpp
    M src/map_location.cpp
    M src/map_location.hpp
    M src/menu_events.cpp
    M src/play_controller.cpp
    M src/play_controller.hpp
    M src/playsingle_controller.cpp
    M src/replay.cpp
    M src/replay_controller.cpp
    M src/reports.cpp
    M src/scripting/lua.cpp
    M src/sdl/texture.cpp
    M src/sdl/texture.hpp
    M src/sdl/window.cpp
    M src/sdl/window.hpp
    M src/team.cpp
    M src/team.hpp
    M src/terrain_filter.cpp
    M src/tod_manager.cpp
    M utils/mp-server/update_server

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


Compare: https://github.com/wesnoth/wesnoth/compare/d0d95f2f9f7a...392ef8b1bd51