summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2007-06-06 19:28:58 +0000
committerBjørn Lindeijer <bjorn@lindeijer.nl>2007-06-06 19:28:58 +0000
commit93a3d067c7f9ffaed785baaa021c572eed0ef57c (patch)
tree5ddcefc810d7062445d1f5948ac1dddc334331c8
parentfaaeb5b8fe542a96b7c04c8c6242207f88b2c4ab (diff)
downloadmana-93a3d067c7f9ffaed785baaa021c572eed0ef57c.tar.gz
mana-93a3d067c7f9ffaed785baaa021c572eed0ef57c.tar.bz2
mana-93a3d067c7f9ffaed785baaa021c572eed0ef57c.tar.xz
mana-93a3d067c7f9ffaed785baaa021c572eed0ef57c.zip
Fixed defense of silk headband.
-rw-r--r--ChangeLog12
-rw-r--r--src/gui/setup_video.cpp2
2 files changed, 9 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index acf0dc46..cdbc6492 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,13 +1,17 @@
-2007-06-04 Philipp Sehmisch <tmw@crushnet.org>
+2007-06-06 Bjørn Lindeijer <bjorn@lindeijer.nl>
- * data/graphics/maps/new_17-1.tmx.gz: Changed the minimap image
- of the lamp snake cave to the correct one.
+ * data/items.xml: Fixed defense of silk headband.
+
+2007-06-04 Philipp Sehmisch <tmw@crushnet.org>
+
+ * data/graphics/maps/new_17-1.tmx.gz: Changed the minimap image of the
+ lamp snake cave to the correct one.
2007-06-03 David Athay <ko2fan@gmail.com>
* src/main.cpp, src/game.cpp: Fixed screenshot taking on OSX.
-2007-06-03 Bjørn Lindeijer <bjorn@lindeijer.nl>
+2007-06-03 Bjørn Lindeijer <bjorn@lindeijer.nl>
* src/CMakeLists.txt, src/Makefile.am, docs/Makefile.am: Added some
files to be included with the release.
diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp
index 2bd7ee38..d2c6d93c 100644
--- a/src/gui/setup_video.cpp
+++ b/src/gui/setup_video.cpp
@@ -263,7 +263,7 @@ void Setup_Video::apply()
}
}
} else {
- new OkDialog("Switching to FullScreen",
+ new OkDialog("Switching to full screen",
"Restart needed for changes to take effect.");
}
config.setValue("screen", fullscreen ? 1 : 0);