From a84133850af6d348c0c4e252b26618148702153b Mon Sep 17 00:00:00 2001 From: Bjørn Lindeijer Date: Thu, 20 Sep 2007 13:24:20 +0000 Subject: Merged a bunch of small changes from trunk to 0.0 and set svn:eol-style to native for some files that were still missing this property. This is a feeble attempt to reduce the amount of conflicts for future merges. --- ChangeLog | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index cb92d5f8..82835517 100644 --- a/ChangeLog +++ b/ChangeLog @@ -256,6 +256,12 @@ village indoor tilesets. * data/maps/new_20-1.tmx.gz: Added woodland village indoor map. +2007-07-29 Guillaume Melquiond + + * CMake/Modules/FindLibXml2.cmake, CMake/Modules/FindLibcurl.cmake, + src/CMakeLists.txt: Switch to upstream CMake modules for libxml2 and + curl. + 2007-07-25 Joshua Langley * src/gui/setup.cpp, src/gui/setup_keyboard.cpp, @@ -2422,8 +2428,14 @@ * data/graphics/sprites/item003.png, data/graphics/sprites/item003.xml: Added the leather shirt +2007-07-25 Guillaume Melquiond + + * src/resources/image.cpp: Added support for subimages of subimages. + 2006-07-25 Bjørn Lindeijer + * src/log.cpp, src/log.h: Added support for writing log to standard + output. * src/gui/updatewindow.cpp: Fixed updating on Windows. 2006-07-24 Bjørn Lindeijer -- cgit v1.2.3-70-g09d2