From 3c2c734367154c8d35fefb72dc98e7d3a2600e56 Mon Sep 17 00:00:00 2001
From: Guus Sliepen <guus@debian.org>
Date: Thu, 30 Dec 2010 16:13:01 +0100
Subject: [PATCH] Bump version and update changelog.

---
 doc/changes      | 39 +++++++++++++++++++++++++++++++++++++++
 doc/readme       |  2 +-
 makefile         |  2 +-
 makefile.windows |  2 +-
 4 files changed, 42 insertions(+), 3 deletions(-)

diff --git a/doc/changes b/doc/changes
index 043e54e..67876d6 100644
--- a/doc/changes
+++ b/doc/changes
@@ -1,6 +1,45 @@
 CHANGE LOG
 ----------
 
+Version 1.18
+
+* Updated Catalan and Dutch translations.
+
+* Minor spelling errors fixed.
+
+* Moved desktop entry from Applicaitons to ArcadeGame section.
+
+* Perform a sanitiy check when loading keyboard.cfg.
+
+* Allow the game to run without music and sounds.
+
+* Fixed bug preventing long messages to be seen.
+
+* Briefly show music credits at the start of a level.
+
+* Fixed bugs found by Valgrind and Cppcheck.
+
+* Prevent the player from getting the JetPack too early.
+
+* Added Free music and sound effects.
+
+* Added exit screen.
+
+Version 1.17
+
+* Add medal support.
+
+Version 1.06
+
+* Fixed behaviour of decorative tiles in certain maps.
+
+* Fixed item placements with tall objects.
+
+* Fixed MIA placement on a lift while moving around.
+
+* Ensure killing all bosses completes the objective.
+
+
 Version 1.05
 
 * Fixed endian issue with PAK file creation code. PAK file is now created using
diff --git a/doc/readme b/doc/readme
index d625fae..4772df5 100644
--- a/doc/readme
+++ b/doc/readme
@@ -1,6 +1,6 @@
 Blob Wars : Metal Blob Solid
 
-Version 1.04
+Version 1.18
 
 LICENSE
 
diff --git a/makefile b/makefile
index ea05036..bb348d6 100755
--- a/makefile
+++ b/makefile
@@ -3,7 +3,7 @@ PAKNAME = blobwars.pak
 DOCS = doc/*
 ICONS = icons/
 
-VERSION = 1.17
+VERSION = 1.18
 RELEASE = 1
 USEPAK = 0
 
diff --git a/makefile.windows b/makefile.windows
index ed7c7ad..52f0ddd 100755
--- a/makefile.windows
+++ b/makefile.windows
@@ -3,7 +3,7 @@ PAKNAME = blobwars.pak
 DOCS = doc/*
 ICONS = icons/
 
-VERSION = 1.17
+VERSION = 1.18
 RELEASE = 1
 USEPAK = 1
 
-- 
2.39.5