Author: fendrin
Date: Fri Mar 11 15:31:32 2011
New Revision: 48841
URL: http://svn.gna.org/viewcvs/wesnoth?rev=48841&view=rev
Log:
Half way through the merge.
Program compiles and runs but is a living segfault.
Added:
branches/editor/images/buttons/units_button_editor-active.png (with props)
branches/editor/images/buttons/units_button_editor-pressed.png (with
props)
branches/editor/images/buttons/units_button_editor.png (with props)
branches/editor/images/buttons/villages_button_editor-active.png (with
props)
branches/editor/images/buttons/villages_button_editor-pressed.png (with
props)
branches/editor/images/buttons/villages_button_editor.png (with props)
branches/editor/src/map_area.cpp
branches/editor/src/map_area.hpp
Modified:
branches/editor/data/campaigns/Legend_of_Wesmere/maps/Kalian.map
branches/editor/data/themes/editor.cfg
branches/editor/src/CMakeLists.txt
branches/editor/src/SConscript
branches/editor/src/editor/action.cpp
branches/editor/src/editor/action.hpp
branches/editor/src/editor/editor_controller.cpp
branches/editor/src/editor/editor_layout.cpp
branches/editor/src/editor/editor_map.cpp
branches/editor/src/editor/editor_map.hpp
branches/editor/src/editor/map_context.cpp
branches/editor/src/editor/map_context.hpp
branches/editor/src/editor/mouse_action.cpp
branches/editor/src/map_label.cpp
branches/editor/src/map_label.hpp
[This mail would be too long, it was shortened to contain the URLs only.]
Modified: branches/editor/data/campaigns/Legend_of_Wesmere/maps/Kalian.map
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/editor/data/campaigns/Legend_of_Wesmere/maps/Kalian.map?rev=48841&r1=48840&r2=48841&view=diff
Modified: branches/editor/data/themes/editor.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/editor/data/themes/editor.cfg?rev=48841&r1=48840&r2=48841&view=diff
Added: branches/editor/images/buttons/units_button_editor-active.png
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/editor/images/buttons/units_button_editor-active.png?rev=48841&view=auto
Added: branches/editor/images/buttons/units_button_editor-pressed.png
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/editor/images/buttons/units_button_editor-pressed.png?rev=48841&view=auto
Added: branches/editor/images/buttons/units_button_editor.png
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/editor/images/buttons/units_button_editor.png?rev=48841&view=auto
Added: branches/editor/images/buttons/villages_button_editor-active.png
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/editor/images/buttons/villages_button_editor-active.png?rev=48841&view=auto
Added: branches/editor/images/buttons/villages_button_editor-pressed.png
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/editor/images/buttons/villages_button_editor-pressed.png?rev=48841&view=auto
Added: branches/editor/images/buttons/villages_button_editor.png
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/editor/images/buttons/villages_button_editor.png?rev=48841&view=auto
Modified: branches/editor/src/CMakeLists.txt
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/editor/src/CMakeLists.txt?rev=48841&r1=48840&r2=48841&view=diff
Modified: branches/editor/src/SConscript
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/editor/src/SConscript?rev=48841&r1=48840&r2=48841&view=diff
Modified: branches/editor/src/editor/action.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/editor/src/editor/action.cpp?rev=48841&r1=48840&r2=48841&view=diff
Modified: branches/editor/src/editor/action.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/editor/src/editor/action.hpp?rev=48841&r1=48840&r2=48841&view=diff
Modified: branches/editor/src/editor/editor_controller.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/editor/src/editor/editor_controller.cpp?rev=48841&r1=48840&r2=48841&view=diff
Modified: branches/editor/src/editor/editor_layout.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/editor/src/editor/editor_layout.cpp?rev=48841&r1=48840&r2=48841&view=diff
Modified: branches/editor/src/editor/editor_map.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/editor/src/editor/editor_map.cpp?rev=48841&r1=48840&r2=48841&view=diff
Modified: branches/editor/src/editor/editor_map.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/editor/src/editor/editor_map.hpp?rev=48841&r1=48840&r2=48841&view=diff
Modified: branches/editor/src/editor/map_context.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/editor/src/editor/map_context.cpp?rev=48841&r1=48840&r2=48841&view=diff
Modified: branches/editor/src/editor/map_context.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/editor/src/editor/map_context.hpp?rev=48841&r1=48840&r2=48841&view=diff
Modified: branches/editor/src/editor/mouse_action.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/editor/src/editor/mouse_action.cpp?rev=48841&r1=48840&r2=48841&view=diff
Added: branches/editor/src/map_area.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/editor/src/map_area.cpp?rev=48841&view=auto
Added: branches/editor/src/map_area.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/editor/src/map_area.hpp?rev=48841&view=auto
Modified: branches/editor/src/map_label.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/editor/src/map_label.cpp?rev=48841&r1=48840&r2=48841&view=diff
Modified: branches/editor/src/map_label.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/editor/src/map_label.hpp?rev=48841&r1=48840&r2=48841&view=diff
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
