summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2007-09-20 13:24:20 +0000
committerBjørn Lindeijer <bjorn@lindeijer.nl>2007-09-20 13:24:20 +0000
commita84133850af6d348c0c4e252b26618148702153b (patch)
treef4b8d7c9bbdeecd9c1976bdc3d3806909a25cd28 /ChangeLog
parent1afcf2608c0a466d2df21faea1530955cc8061fc (diff)
downloadmana-a84133850af6d348c0c4e252b26618148702153b.tar.gz
mana-a84133850af6d348c0c4e252b26618148702153b.tar.bz2
mana-a84133850af6d348c0c4e252b26618148702153b.tar.xz
mana-a84133850af6d348c0c4e252b26618148702153b.zip
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.
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog12
1 files changed, 12 insertions, 0 deletions
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 <guillaume.melquiond@gmail.com>
+
+ * 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 <joshlangley[at]optusnet.com.au>
* 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 <guillaume.melquiond@gmail.com>
+
+ * src/resources/image.cpp: Added support for subimages of subimages.
+
2006-07-25 Bjørn Lindeijer <bjorn@lindeijer.nl>
+ * 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 <bjorn@lindeijer.nl>