From 7f27bac4642d98669e8a6b1a1152c32dd579daa6 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 24 Apr 2015 08:09:04 +0530
Subject: [PATCH] version 2.26.0

---
 Changelog.yaml           | 38 ++++++++++++++++++++++++++++++++++++++
 src/calibre/constants.py |  2 +-
 2 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/Changelog.yaml b/Changelog.yaml
index 8e4c460dbd..e9189a19bd 100644
--- a/Changelog.yaml
+++ b/Changelog.yaml
@@ -20,6 +20,44 @@
 #   new recipes:
 #     - title: 
 
+- version: 2.26.0
+  date: 2015-04-24
+
+  new features:
+    - title: "Driver for the soon to be released Kobo Glo HD"
+
+  bug fixes:
+    - title: "Do not use a separate process to draw the splash screen. This might fix the issue of calibre randomly freezing on startup on a few windows systems"
+
+    - title: "MOBI Ouput: Fix :first-letter applied to elements containing a comment causing conversion to fail"
+
+    - title: "Properly display names of libraries containing the ampersand character."
+      tickets: [1447188]
+
+    - title: "When sorting filenames in comics treat the file extension as a secondary sort key. Fixes xyz.jpg sorting before xyz_1.jpg"
+
+    - title: "Fix a regression in 2.25 that broke the search & replace wizard in the conversion dialog when converting a book with multiple formats"
+
+    - title: "Content server: Fix errors when library contains enough virtual libraries to cause grouping."
+      tickets: [1446282]
+
+    - title: "Manage tags dialog: Fix setting a tag to empty causes an unhandled error."
+      tickets: [1446318]
+
+    - title: "E-book viewer: Fix a regression that caused the viewer to occasionally skip the last page in a chapter when displaying more than one pages per screen and scrolling by screen"
+
+    - title: "Edit Book: Fix open OPF file not being refreshed when deleting items from the file browser."
+      tickets: [1445634]
+
+  improved recipes:
+    - WirtschaftsWoche Online
+    - Wired
+    - CNN
+
+  new recipes:
+    - title: Discover Magazine Monthly 
+      author: Michael Marotta
+
 - version: 2.25.0
   date: 2015-04-17
 
diff --git a/src/calibre/constants.py b/src/calibre/constants.py
index 03137fe331..d77fd2bc44 100644
--- a/src/calibre/constants.py
+++ b/src/calibre/constants.py
@@ -4,7 +4,7 @@ __license__   = 'GPL v3'
 __copyright__ = '2008, Kovid Goyal kovid@kovidgoyal.net'
 __docformat__ = 'restructuredtext en'
 __appname__   = u'calibre'
-numeric_version = (2, 25, 0)
+numeric_version = (2, 26, 0)
 __version__   = u'.'.join(map(unicode, numeric_version))
 __author__    = u"Kovid Goyal <kovid@kovidgoyal.net>"