From b95efa171fdad322fc55bf31f276b2149834decc Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 4 Aug 2017 08:02:15 +0530
Subject: [PATCH] version 3.6.0

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

diff --git a/Changelog.yaml b/Changelog.yaml
index aa5c490368..254c44dbd5 100644
--- a/Changelog.yaml
+++ b/Changelog.yaml
@@ -20,6 +20,45 @@
 #   new recipes:
 #     - title:
 
+- version: 3.6.0
+  date: 2017-08-04
+
+  new features:
+    - title: "Linux: Use native file dialogs via zenity or kdialog, if available"
+
+    - title: "Copy to library: Add an action to show a dialog that allows for easy selection of libraries for copy/move. Useful when there are a large number of libraries to choose from."
+      tickets: [1706198]
+
+    - title: 'Server: Allow deleting a downloaded book from the "Browse all downloaded books" screen'
+
+  bug fixes:
+    - title: "Hopefully fix an issue with the book list jumping around when using the mouse on some computers"
+
+    - title: "E-book viewer: Change the default fonts on windows to the Liberation font family. This matches the other platforms and avoids rendering issues with Times New Roman."
+      tickets: [1706491]
+
+    - title: "DOCX Output: Convert images placed by themselves inside block tags as block images rather than inline images."
+      tickets: [1707430]
+
+    - title: "Fix a typo that broke the download of a few news sources"
+
+    - title: "ebook-viewer.exe: Fix --continue-reading not working"
+
+    - title: "Fix non XML safe characters in feed descriptions causing news download to fail."
+      tickets: [1707545]
+
+    - title: "Browser viewer: Fix books that contain broken links with unicode characters in their paths not working."
+      tickets: [1704498]
+
+    - title: "Quickview: Fix regression in previous release that broke the 'Lock quickview' control"
+
+  improved recipes:
+    - Navy Times
+
+  new recipes:
+    - title: Various Sardinian news
+      author: tzium
+
 - version: 3.5.0
   date: 2017-07-28
 
diff --git a/src/calibre/constants.py b/src/calibre/constants.py
index b40da9b1fd..0875859268 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, 5, 0)
+numeric_version = (3, 6, 0)
 __version__   = u'.'.join(map(unicode, numeric_version))
 __author__    = u"Kovid Goyal <kovid@kovidgoyal.net>"