From 3926ce682affb560806281231ff30d8c0a98afec Mon Sep 17 00:00:00 2001
From: Christian Dywan <christian@twotoasts.de>
Date: Sun, 16 May 2010 20:32:16 +0200
Subject: [PATCH] Bump version to 0.2.5

---
 ChangeLog | 30 ++++++++++++++++++++++++++++++
 wscript   |  2 +-
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index d5a8a895..cdc6687a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,35 @@
 This file is licensed under the terms of the expat license, see the file EXPAT.
 
+v0.2.5
+ + Keyboard access in speed dial
+ + Panels adapt to system icon style
+ + Revamp tab focus handling
+ + Use new GTK+ 2.20 spinner (throbber) widget
+ + Userscripts and -styles can be (de)activated
+ + Warn if trying to download with few space
+ + Support right button in Mouse Gestures
+ + Add (unfinished) 'External Applications' extension
+ + Vala support for extensions and tests
+ + Yellow location for valid SSL, red for invalid
+ + Render XML as source code
+ + Provide tools/midori-dev and check-style scripts
+ + Implement MIDORI_ADBLOCK for Adblock testing
+ + Fix https URI support in Adblock
+ + Change 'Autodetect proxy' into 'Proxy type'
+ + Update use of deprecated GTK+ API
+ + Implement --blocked-uris for kiosk usage
+ + Implement --inactivity-reset for kiosk usage
+ + Fix typing with dead keys and NumLock
+ + Improve parsing in the Feed Panel
+ + Add preference 'Allow scripts to open popups'
+ + Spawn web apps and private mode with same executable
+ + Base Colourful Tabs on icon colours
+ + Add Status Clock extension
+ + Resolve hosts before trying a search
+ + Allow page icons for https
+ + Improve handling of special pages
+ + Protect against recursive external URI handlers
+
 v0.2.4
  + Prevent completion from overlapping
  + Fix tab order when restoring session
diff --git a/wscript b/wscript
index d37934af..f0a6d195 100644
--- a/wscript
+++ b/wscript
@@ -29,7 +29,7 @@ from Configure import find_program_impl
 
 major = 0
 minor = 2
-micro = 4
+micro = 5
 
 APPNAME = 'midori'
 VERSION = str (major) + '.' + str (minor) + '.' + str (micro)