From fe63b2fde8fe393cf85cad5d76c76c1db327e525 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 15 Jun 2018 06:26:53 +0530
Subject: [PATCH] version 3.26.0

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

diff --git a/Changelog.yaml b/Changelog.yaml
index 7f8ebc94f0..3242a72950 100644
--- a/Changelog.yaml
+++ b/Changelog.yaml
@@ -20,6 +20,57 @@
 #   new recipes:
 #     - title:
 
+- version: 3.26.0
+  date: 2018-06-15
+
+  new features:
+    - title: "Book list: Allow drag and drop of books onto other books to merge the book records."
+      tickets: [1775123]
+
+    - title: "Check Book: External link checker: Also check HTML anchors (the part after the # in the link). Can be turned off via a checkbox at the bottom of the link checker window."
+
+    - title: "Edit Book: Preview panel: Show previews when editing SVG files"
+
+    - title: "Edit book: When downloading external resources, also convert data URLs into files."
+      tickets: [1774945]
+
+    - title: "E-book viewer: When the controls are hidden show the progress in the window title."
+      tickets: [1776710]
+
+    - title: "Library Quick switch menu: Highlight the previously switched from library in bold."
+      tickets: [1775888]
+
+  bug fixes:
+    - title: "PDF Input: Fix a regression in 3.24 that caused conversion of PDF to be significantly worse."
+      tickets: [1775984]
+
+    - title: "E-book viewer: Fix very slow loading for HTML files with very many images on Linux."
+      tickets: [1774884]
+
+    - title: "Content server: Fix a regression in 3.14 that removed the separator between books in the detailed list view mode."
+      tickets: [1776294]
+
+    - title: "Edit book: Fix SVG files not being beautified by the Beautify all files tool"
+
+    - title: "Edit book: Fix searching in selected files not searching SVG files"
+
+    - title: "Fix Tweaks help string not being displayed translated"
+
+    - title: "Edit metadata dialog: Fix distorted rendering of some labels in the custom metadata tab in rare circumstances."
+      tickets: [1766762]
+
+  improved recipes:
+    - Slate
+    - New York Times Book Review
+    - The Independent UK
+    - NYTimes Tech Beat
+    - New York Times
+    - Cracked.com
+
+  new recipes:
+    - title: El Cronista
+      author: Darko Miletic
+
 - version: 3.25.0
   date: 2018-06-01
 
diff --git a/src/calibre/constants.py b/src/calibre/constants.py
index fb9fe2460b..359601cd90 100644
--- a/src/calibre/constants.py
+++ b/src/calibre/constants.py
@@ -6,7 +6,7 @@ from future_builtins import map
 import sys, locale, codecs, os, importlib, collections
 
 __appname__   = u'calibre'
-numeric_version = (3, 25, 0)
+numeric_version = (3, 26, 0)
 __version__   = u'.'.join(map(unicode, numeric_version))
 __author__    = u"Kovid Goyal <kovid@kovidgoyal.net>"