summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@agendaless.com>2010-02-03 05:01:29 +0000
committerChris McDonough <chrism@agendaless.com>2010-02-03 05:01:29 +0000
commitf86d88b3e30002cf81d3b39ca6587932a12e7dc2 (patch)
tree0eff458dccfa8bdcc71a0caf4f0fa761ae320721
parent309752fc3ab99d4634c10152b34dc8ec0284a4b2 (diff)
downloadpyramid-f86d88b3e30002cf81d3b39ca6587932a12e7dc2.tar.gz
pyramid-f86d88b3e30002cf81d3b39ca6587932a12e7dc2.tar.bz2
pyramid-f86d88b3e30002cf81d3b39ca6587932a12e7dc2.zip
Prep for 1.2b4.
-rw-r--r--CHANGES.txt4
-rw-r--r--docs/conf.py2
-rw-r--r--setup.py2
3 files changed, 4 insertions, 4 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index 8a88d62d3..1d5d7ce08 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,5 @@
-Next release
-============
+1.2b4 (2010-02-03)
+==================
Documentation
-------------
diff --git a/docs/conf.py b/docs/conf.py
index 033b051cc..cdd4ef3b0 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -53,7 +53,7 @@ copyright = '2008-2010, Agendaless Consulting'
# other places throughout the built documents.
#
# The short X.Y version.
-version = '1.2b3'
+version = '1.2b4'
# The full version, including alpha/beta/rc tags.
release = version
diff --git a/setup.py b/setup.py
index c459d86a8..807808be7 100644
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,7 @@
#
##############################################################################
-__version__ = '1.2b3'
+__version__ = '1.2b4'
import os
import sys