summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2007-09-27 14:54:09 +0000
committerBjørn Lindeijer <bjorn@lindeijer.nl>2007-09-27 14:54:09 +0000
commit285da0d05eb2e6b680a8dfc497cf4ecab75b7aa4 (patch)
tree0a4e4169ffada0fbdc25fd91822a8c0fe678571c /ChangeLog
parentc24856707233ceb3995e43f8f7da63e65999df1e (diff)
downloadmana-285da0d05eb2e6b680a8dfc497cf4ecab75b7aa4.tar.gz
mana-285da0d05eb2e6b680a8dfc497cf4ecab75b7aa4.tar.bz2
mana-285da0d05eb2e6b680a8dfc497cf4ecab75b7aa4.tar.xz
mana-285da0d05eb2e6b680a8dfc497cf4ecab75b7aa4.zip
Merged another bunch of changes from trunk to 0.0 to reduce the difference.
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog20
1 files changed, 16 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 8bc7efdf..92a283d8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -275,6 +275,17 @@
src/CMakeLists.txt: Switch to upstream CMake modules for libxml2 and
curl.
+2007-07-27 Guillaume Melquiond <guillaume.melquiond@gmail.com>
+
+ * src/resources/image.cpp: Added support for subimages of subimages.
+ * src/gui/equipmentwindow.cpp, src/gui/button.cpp, src/gui/slider.cpp,
+ src/gui/widgets/resizegrip.cpp, src/gui/widgets/dropdown.cpp,
+ src/gui/progressbar.cpp, src/gui/browserbox.cpp, src/gui/gui.cpp,
+ src/gui/radiobutton.cpp, src/gui/textfield.cpp, src/gui/playerbox.cpp,
+ src/gui/itemcontainer.cpp, src/gui/checkbox.cpp, src/gui/minimap.cpp,
+ src/gui/scrollarea.cpp, src/gui/popupmenu.cpp: Removed useless yet
+ costly dynamic casts.
+
2007-07-25 Joshua Langley <joshlangley[at]optusnet.com.au>
* src/gui/setup.cpp, src/gui/setup_keyboard.cpp,
@@ -1638,6 +1649,11 @@
src/player.h, src/being.cpp, src/being.h, data/items.xml: Added scythe
as a permanent weapon (ID: 623)
+2006-11-04 Björn Steinbrink <B.Steinbrink@gmx.de>
+
+ * src/gui/updatewindow.cpp, src/gui/updatewindow.h: Removed useless
+ addRow method.
+
2006-11-04 Bjørn Lindeijer <bjorn@lindeijer.nl>
* data/maps/new_1-1.tmx.gz, data/maps/new_10-1.tmx.gz,
@@ -2441,10 +2457,6 @@
* 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