summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2013-03-31 15:45:44 +0200
committerGeorg Brandl <georg@python.org>2013-03-31 15:45:44 +0200
commit0b41ccb0057eb95995e6340f4bcffbfae3acc8a8 (patch)
treeb1081774be3708bcd651d5c5f8ece8e68d7a7a12
parent9abf39f912ebdf947089c07d2bace20974a3755c (diff)
downloadsphinx-git-0b41ccb0057eb95995e6340f4bcffbfae3acc8a8.tar.gz
Bump to 1.2b1.v1.2b1
-rw-r--r--CHANGES4
-rw-r--r--sphinx/__init__.py4
2 files changed, 4 insertions, 4 deletions
diff --git a/CHANGES b/CHANGES
index eea87b8ac..000045bad 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,5 @@
-Release 1.2 (in development)
-============================
+Release 1.2 (beta1 released Mar 31, 2013)
+=========================================
Incompatible changes
--------------------
diff --git a/sphinx/__init__.py b/sphinx/__init__.py
index 88d47cd11..c091a6776 100644
--- a/sphinx/__init__.py
+++ b/sphinx/__init__.py
@@ -15,8 +15,8 @@
import sys
from os import path
-__version__ = '1.2pre'
-__released__ = '1.2 (hg)' # used when Sphinx builds its own docs
+__version__ = '1.2b1'
+__released__ = '1.2b1' # used when Sphinx builds its own docs
package_dir = path.abspath(path.dirname(__file__))