From dbd11d27e37aff718bf20cf46ac8a494616d7e28 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 29 May 2015 08:15:16 +0530
Subject: [PATCH] version 2.29.0

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

diff --git a/Changelog.yaml b/Changelog.yaml
index 9809a81a90..491417b44d 100644
--- a/Changelog.yaml
+++ b/Changelog.yaml
@@ -20,6 +20,37 @@
 #   new recipes:
 #     - title: 
 
+- version: 2.29.0
+  date: 2015-05-29
+
+  new features:
+    - title: "Allow opening the full Tag Editor dialog directly from the book list by holding down the Shift key while starting an edit of a tag-like field. For example, click on the tags field for a book and press Shift-F2"
+
+    - title: "Tag Browser: Allow undoing the deletion of items in the Manage categories window"
+
+    - title: "calibredb add: Allow setting arbitrary identifiers, not just ISBN."
+      tickets: [1458620]
+
+    - title: "Add a 'Retry' button to the news download failed error message."
+      tickets: [1458076]
+
+  bug fixes:
+    - title: "DOCX Output: Detect the common idiom of placing centered images as inline images inside a containing centered block and render the resulting image as a floating centered image in the DOCX file."
+      tickets: [1455502]
+
+    - title: "DOCX Output: Fix incorrect handling of bold/italic in paragraphs where the majority of text is either bold or italic instead of normal"
+
+    - title: "Table of Contents editor: Fix save/load of settings in the XPath wizard not working across restarts"
+
+    - title: "Get Books: Update the Kobo Store plugin for website changes"
+
+  improved recipes:
+    - Popular Science
+    - General Knowledge Today
+    - Scientific American
+    - Wired Magazine
+
+
 - version: 2.28.0
   date: 2015-05-15
 
diff --git a/src/calibre/constants.py b/src/calibre/constants.py
index 69a7b9d611..3e7bac59b8 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, 28, 0)
+numeric_version = (2, 29, 0)
 __version__   = u'.'.join(map(unicode, numeric_version))
 __author__    = u"Kovid Goyal <kovid@kovidgoyal.net>"