From: Christian Dywan <christian@twotoasts.de>
Date: Mon, 24 May 2010 17:34:44 +0000 (+0200)
Subject: Bump version to 0.2.6
X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=83a737e386c42428d45211c815aa66c11ffaa78d;p=midori

Bump version to 0.2.6
---

diff --git a/ChangeLog b/ChangeLog
index cdc6687a..42b0fba5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 This file is licensed under the terms of the expat license, see the file EXPAT.
 
+v0.2.6
+ + Show a dialogue when quitting while downloading
+ + Render icons in errors/ speed dial properly
+ + Fix a build error with API documentation
+ + Fix error pages in frames, and a related crash
+ + Allow more shortcuts or columns in speed dial
+ + Add 'Copy All' button to Console panel
+
 v0.2.5
  + Keyboard access in speed dial
  + Panels adapt to system icon style
diff --git a/wscript b/wscript
index f0a6d195..fbbb6e8b 100644
--- a/wscript
+++ b/wscript
@@ -29,7 +29,7 @@ from Configure import find_program_impl
 
 major = 0
 minor = 2
-micro = 5
+micro = 6
 
 APPNAME = 'midori'
 VERSION = str (major) + '.' + str (minor) + '.' + str (micro)