[Commits] [wesnoth/wesnoth] 96a9e2: Use xvfb on travis

[GitHub]

  Branch: refs/heads/1.12
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 96a9e2df913609d92342e991ccffdba5ef5a465a
      https://github.com/wesnoth/wesnoth/commit/96a9e2df913609d92342e991ccffdba5ef5a465a
  Author: Alexander van Gessel <ai0867 at gmail.com>
  Date:   2014-05-19 (Mon, 19 May 2014)

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  Use xvfb on travis

As instructed on http://docs.travis-ci.com/user/gui-and-headless-browsers/


  Commit: 484bcb539867ae540eb4bd760b3b908dcf5fdcd5
      https://github.com/wesnoth/wesnoth/commit/484bcb539867ae540eb4bd760b3b908dcf5fdcd5
  Author: Alexander van Gessel <ai0867 at gmail.com>
  Date:   2014-05-19 (Mon, 19 May 2014)

  Changed paths:
    M src/tests/test_mp_connect.cpp

  Log Message:
  -----------
  Disable some failing tests

These tests may no longer be correct. Their author is looking into them.


  Commit: 80bd6a06e72a484079f071d1957e263cdbd6c605
      https://github.com/wesnoth/wesnoth/commit/80bd6a06e72a484079f071d1957e263cdbd6c605
  Author: Alexander van Gessel <ai0867 at gmail.com>
  Date:   2014-05-19 (Mon, 19 May 2014)

  Changed paths:
    M changelog
    M data/core/macros/utils.cfg
    M data/tools/addon_manager/html.py
    M data/tools/addon_manager/style.css
    M data/tools/wmllint
    M src/CMakeLists.txt
    M src/SConscript
    M src/actions/move.cpp
    M src/actions/undo.cpp
    M src/actions/undo.hpp
    M src/dialogs.cpp
    M src/editor/editor_controller.cpp
    M src/filesystem.cpp
    M src/game_events/action_wml.cpp
    M src/help.cpp
    M src/help.hpp
    M src/lexical_cast.hpp
    M src/map_location.cpp
    M src/map_location.hpp
    M src/multiplayer_connect_engine.cpp
    M src/multiplayer_create_engine.cpp
    M src/play_controller.cpp
    M src/playsingle_controller.cpp
    M src/replay_helper.cpp
    M src/replay_helper.hpp
    M src/reports.cpp
    M src/scripting/lua.cpp
    M src/sdl_utils.cpp
    M src/synced_commands.cpp
    M src/team.hpp
    A src/tests/test_map_location.cpp
    M src/util.hpp

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


Compare: https://github.com/wesnoth/wesnoth/compare/04191ff6fcf0...80bd6a06e72a