[Adonthell-commits] [ksterker/adonthell] 7c2ccc: UPDATED include directive

[noreply]

Branch: refs/heads/master
Home:   https://github.com/ksterker/adonthell

Commit: 7c2ccc88f32fbea0eb299ba1a9400d7a2e662e4c
    
https://github.com/ksterker/adonthell/commit/7c2ccc88f32fbea0eb299ba1a9400d7a2e662e4c
Author: ksterker <address@hidden>
Date:   2011-02-01 (Tue, 01 Feb 2011)

Changed paths:
  M src/input/mouse_event.cc

Log Message:
-----------
UPDATED include directive


Commit: 2ef84b4550732ca93cc088363da95f5cd4ebdecd
    
https://github.com/ksterker/adonthell/commit/2ef84b4550732ca93cc088363da95f5cd4ebdecd
Author: ksterker <address@hidden>
Date:   2011-02-01 (Tue, 01 Feb 2011)

Changed paths:
  M src/base/base.cc
  M src/base/base.h
  M src/base/logging.cc
  M src/base/logging.h
  M src/gfx/drawing_area.h
  M src/gfx/screen.cc
  M src/gfx/screen.h
  M src/gfx/surface.cc
  M src/gfx/surface.h
  M src/gui/CMakeLists.txt
  M src/gui/Makefile.am
  A src/gui/canvas.cc
  A src/gui/canvas.h
  M src/gui/conversation.cc
  M src/gui/conversation.h
  M src/gui/decoration.cc
  M src/gui/decoration.h
  M src/gui/gui.h
  A src/gui/indicatorbar.cc
  A src/gui/indicatorbar.h
  M src/gui/layout.cc
  M src/gui/layout.h
  A src/gui/listlayout.cc
  A src/gui/listlayout.h
  A src/gui/scrollview.cc
  A src/gui/scrollview.h
  M src/gui/textbox.h
  M src/gui/widget.h
  M src/gui/window_manager.cc
  M src/gui/window_manager.h
  M src/input/mouse_event.cc
  M src/input/sdl13/manager_sdl.cc
  M src/main/adonthell.cc
  M src/py-wrappers/adonthell/py_gui.i
  M src/python/python.cc
  M src/world/character.cc
  M src/world/placeable.cc
  M src/world/renderer.cc
  M test/data/characters/character.py
  A test/data/gfx/gui/black.png
  A test/data/gfx/gui/list_item.xml
  A test/data/gfx/gui/scrollbar.xml
  A test/data/gfx/gui/scrollbar_bg.png
  A test/data/gfx/gui/scrollbar_bl.png
  A test/data/gfx/gui/scrollbar_bot.png
  A test/data/gfx/gui/scrollbar_br.png
  A test/data/gfx/gui/scrollbar_h_end.png
  A test/data/gfx/gui/scrollbar_h_handle.png
  A test/data/gfx/gui/scrollbar_h_mid.png
  A test/data/gfx/gui/scrollbar_h_start.png
  A test/data/gfx/gui/scrollbar_lft.png
  A test/data/gfx/gui/scrollbar_rgt.png
  A test/data/gfx/gui/scrollbar_tl.png
  A test/data/gfx/gui/scrollbar_top.png
  A test/data/gfx/gui/scrollbar_tr.png
  A test/data/gfx/gui/scrollbar_v_end.png
  A test/data/gfx/gui/scrollbar_v_handle.png
  A test/data/gfx/gui/scrollbar_v_mid.png
  A test/data/gfx/gui/scrollbar_v_start.png
  M test/data/schedules/map/mapview.py
  M test/guitest.cc
  M test/worldtest.cc

Log Message:
-----------
Merge branch 'master' of address@hidden:ksterker/adonthell

Conflicts:
        src/input/mouse_event.cc


Commit: 69b41d48c67adfc176362ddde1a9b6e2c6b153be
    
https://github.com/ksterker/adonthell/commit/69b41d48c67adfc176362ddde1a9b6e2c6b153be
Author: ksterker <address@hidden>
Date:   2011-02-01 (Tue, 01 Feb 2011)

Changed paths:
  M src/base/diskwriter_gz.cc
  M src/base/diskwriter_xml.cc
  M src/base/flat.cc
  M src/base/paths.cc
  M src/base/savegame.cc

Log Message:
-----------
CHANGED fprintf(stderr, ... to LOG(ERROR) in some places. 130 more to go.