From 74b4e8f3898536bed32876c42dd9953f41ffea95 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 20 Oct 2017 09:10:52 +0530
Subject: [PATCH] version 3.10.0

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

diff --git a/Changelog.yaml b/Changelog.yaml
index 92b3a945ae..c3e554f4d9 100644
--- a/Changelog.yaml
+++ b/Changelog.yaml
@@ -20,6 +20,34 @@
 #   new recipes:
 #     - title:
 
+- version: 3.10.0
+  date: 2017-10-20
+
+  new features:
+    - title: "Browser viewer: Show footnotes in a popup window. Similar to the popup footnote functionality in the calibre viewer."
+      type: major
+
+    - title: "Content server: Add an option to control the timeout for making AJAX queries to the server."
+      tickets: [1722016]
+
+  bug fixes:
+    - title: "Fix regression that broke Preferences->Conversion->Common options in version 3.9"
+
+    - title: "Server: Fix adding expressions to the search always using AND instead of respecting the setting to use OR or AND."
+      tickets: [1724405]
+
+    - title: "Browser viewer: Fix a regression that caused loading more than one book in the same session or using the back/forward browser buttons to require refreshing the browser."
+
+    - title: "Jobs list: Fix killing of job killing the wrong job if other jobs are completed while waiting for kill confirmation."
+
+    - title: "DOCX Output: Fix preserve cover aspect ratio option still distorting the aspect ratio slightly."
+      tickets: [1721864]
+
+  improved recipes:
+    - Lomza
+    - Go Comics
+    - Various Polish news sources
+
 - version: 3.9.0
   date: 2017-10-06
 
diff --git a/src/calibre/constants.py b/src/calibre/constants.py
index bdbf338ce1..afded4d597 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, 9, 0)
+numeric_version = (3, 10, 0)
 __version__   = u'.'.join(map(unicode, numeric_version))
 __author__    = u"Kovid Goyal <kovid@kovidgoyal.net>"