summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2006-12-25 01:17:28 +0000
committerBjørn Lindeijer <bjorn@lindeijer.nl>2006-12-25 01:17:28 +0000
commit786c223402be77bbe1ecfba9cd37e9401b5a8346 (patch)
treea67543009d1247c9a5f64afc2072851fc8c12c00
parent737de6461dcf687db03bdfa723f375cacf6e849f (diff)
downloadmana-786c223402be77bbe1ecfba9cd37e9401b5a8346.tar.gz
mana-786c223402be77bbe1ecfba9cd37e9401b5a8346.tar.bz2
mana-786c223402be77bbe1ecfba9cd37e9401b5a8346.tar.xz
mana-786c223402be77bbe1ecfba9cd37e9401b5a8346.zip
Added Christmas tree by Pauan.
-rw-r--r--ChangeLog7
-rw-r--r--NEWS2
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 91c163e6..b4e08e8f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
-2006-12-24 Bjørn Lindeijer <bjorn@lindeijer.nl>
+2006-12-25 Bjørn Lindeijer <bjorn@lindeijer.nl>
+
+ * data/graphics/tiles/christmastree.png, data/maps/new_11-1.tmx.gz:
+ Added Christmas tree by Pauan.
+
+2006-12-24 Bjørn Lindeijer <bjorn@lindeijer.nl>
* src/gui/shoplistbox.cpp: Don't try to draw an icon when it is not
defined or failed to load properly.
diff --git a/NEWS b/NEWS
index 62ea7126..9edd05b6 100644
--- a/NEWS
+++ b/NEWS
@@ -6,7 +6,7 @@
- Changed to new update host (http://updates.themanaworld.org)
- Worked around a Guichan exception thrown for mice with many buttons
- Changed mouse walk to keep following mouse while button is held down
-- Extended font support for å and Å.
+- Extended font support for å and Å
- Disabled RLE compression on all surfaces in software mode
- Fixed joystick setting not to show disabled when it's actually enabled
- Fixed money field to no longer hide below the bottom of the window