[Commits] [wesnoth/wesnoth] f364f2: fixup c8699e2f057b14b19ba60dbd4e71f4647b45ca78

[GitHub]

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

  Changed paths:
    M src/game.cpp

  Log Message:
  -----------
  fixup c8699e2f057b14b19ba60dbd4e71f4647b45ca78

When I removed the wesnoth built-in timeouts, I didn't completely
revert some of the changes, I left and include and didn't change
a shared_ptr back to scoped_ptr.


  Commit: 315152d1164923cfb52e10c4c07c9e8339103582
      https://github.com/wesnoth/wesnoth/commit/315152d1164923cfb52e10c4c07c9e8339103582
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-06-03 (Tue, 03 Jun 2014)

  Changed paths:
    M src/CMakeLists.txt
    M src/SConscript
    M src/ai/testing/ca_global_fallback.cpp
    M src/construct_dialog.cpp
    M src/controller_base.cpp
    M src/display.cpp
    M src/editor/palette/palette_manager.cpp
    M src/editor/palette/tristate_button.cpp
    M src/font.cpp
    M src/font.hpp
    M src/gui/auxiliary/canvas.hpp
    M src/gui/dialogs/lobby/lobby_data.hpp
    M src/gui/widgets/scrollbar_container.cpp
    M src/gui/widgets/widget.cpp
    M src/gui/widgets/widget.hpp
    M src/gui/widgets/window.cpp
    M src/halo.cpp
    M src/help.cpp
    M src/hotkey/hotkey_item.cpp
    M src/image.hpp
    M src/image_modifications.hpp
    M src/joystick.hpp
    M src/loadscreen.cpp
    M src/loadscreen.hpp
    M src/menu_events.cpp
    M src/minimap.cpp
    M src/mouse_events.cpp
    M src/mouse_handler_base.cpp
    M src/multiplayer_lobby.cpp
    M src/multiplayer_ui.cpp
    M src/playsingle_controller.cpp
    M src/sdl/rect.cpp
    M src/sdl/rect.hpp
    M src/sdl/texture.cpp
    A src/sdl/utils.cpp
    A src/sdl/utils.hpp
    M src/sdl/window.hpp
    R src/sdl_utils.cpp
    R src/sdl_utils.hpp
    M src/show_dialog.cpp
    M src/storyscreen/part.hpp
    M src/storyscreen/render.cpp
    M src/tests/gui/test_drop_target.cpp
    M src/tests/test_sdl_utils.hpp
    M src/text.hpp
    M src/theme.cpp
    M src/tools/dummy_video.cpp
    M src/tools/exploder_cutter.hpp
    M src/tools/exploder_utils.hpp
    M src/tooltips.cpp
    M src/unit.cpp
    M src/video.cpp
    M src/wesmage/filter.hpp
    M src/widgets/button.cpp
    M src/widgets/menu.cpp
    M src/widgets/scrollarea.cpp
    M src/widgets/scrollbar.cpp
    M src/widgets/scrollpane.hpp
    M src/widgets/slider.cpp
    M src/widgets/slider.hpp
    M src/widgets/textbox.cpp
    M src/widgets/widget.cpp
    M src/widgets/widget.hpp

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


Compare: https://github.com/wesnoth/wesnoth/compare/bc214306405f...315152d11649