From 7d38911f68fd38541e4673fa2ca4977747db0946 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 15 Jun 2018 12:25:24 +0530
Subject: [PATCH] version 3.26.1

---
 Changelog.yaml           | 5 ++++-
 src/calibre/constants.py | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Changelog.yaml b/Changelog.yaml
index 3242a72950..7e84d71e88 100644
--- a/Changelog.yaml
+++ b/Changelog.yaml
@@ -20,7 +20,7 @@
 #   new recipes:
 #     - title:
 
-- version: 3.26.0
+- version: 3.26.1
   date: 2018-06-15
 
   new features:
@@ -59,6 +59,9 @@
     - title: "Edit metadata dialog: Fix distorted rendering of some labels in the custom metadata tab in rare circumstances."
       tickets: [1766762]
 
+    - title: "version 3.26.1 prevents dropping of a book onto itself from triggering the merge dialog, which should reduce accidental triggers"
+      tickets: [1777054]
+
   improved recipes:
     - Slate
     - New York Times Book Review
diff --git a/src/calibre/constants.py b/src/calibre/constants.py
index 359601cd90..56915ba925 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, 26, 0)
+numeric_version = (3, 26, 1)
 __version__   = u'.'.join(map(unicode, numeric_version))
 __author__    = u"Kovid Goyal <kovid@kovidgoyal.net>"