summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshimizukawa <shimizukawa@gmail.com>2015-03-11 15:45:38 +0900
committershimizukawa <shimizukawa@gmail.com>2015-03-11 15:45:38 +0900
commit8f26544dc53dba3622050bb37e937d1ce0597c6c (patch)
treec8bc4f39b689635cf3aba452630f732dd0491506
parentb87ce32e7dc09773f9e71305e66e8d6aead53dd1 (diff)
downloadsphinx-git-8f26544dc53dba3622050bb37e937d1ce0597c6c.tar.gz
Bump to 1.4 development.
-rw-r--r--CHANGES16
-rw-r--r--sphinx/__init__.py6
2 files changed, 19 insertions, 3 deletions
diff --git a/CHANGES b/CHANGES
index f5d5c3009..c1827a642 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,19 @@
+Release 1.4 (in development)
+============================
+
+Incompatible changes
+--------------------
+
+Features added
+--------------
+
+Bugs fixed
+----------
+
+Documentation
+-------------
+
+
Release 1.3 (released Mar 10, 2015)
===================================
diff --git a/sphinx/__init__.py b/sphinx/__init__.py
index 3c4eb8acd..f36ed3a24 100644
--- a/sphinx/__init__.py
+++ b/sphinx/__init__.py
@@ -15,12 +15,12 @@
import sys
from os import path
-__version__ = '1.3'
-__released__ = '1.3' # used when Sphinx builds its own docs
+__version__ = '1.4a0+'
+__released__ = '1.4a0' # used when Sphinx builds its own docs
# version info for better programmatic use
# possible values for 3rd element: 'alpha', 'beta', 'rc', 'final'
# 'final' has 0 as the last element
-version_info = (1, 3, 0, 'final', 0)
+version_info = (1, 4, 0, 'alpha', 0)
package_dir = path.abspath(path.dirname(__file__))