summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@agendaless.com>2009-12-07 11:47:55 +0000
committerChris McDonough <chrism@agendaless.com>2009-12-07 11:47:55 +0000
commitf46de3bb0a9d2c9823aa3221fd28d80aed65b719 (patch)
tree85c53636a0407d643702016920fb1bef4cc1578a
parent2c827e3f2d3fe536d4e7a9425b59270e04871186 (diff)
downloadpyramid-f46de3bb0a9d2c9823aa3221fd28d80aed65b719.tar.gz
pyramid-f46de3bb0a9d2c9823aa3221fd28d80aed65b719.tar.bz2
pyramid-f46de3bb0a9d2c9823aa3221fd28d80aed65b719.zip
Prep for 1.2a4.
-rw-r--r--CHANGES.txt6
-rw-r--r--docs/conf.py2
-rw-r--r--setup.py2
3 files changed, 5 insertions, 5 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index eb6c714ba..885c5e8b1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,5 @@
-Next release
-============
+1.2a4 (2009-12-07)
+==================
Features
--------
@@ -22,7 +22,7 @@ Bug Fixes
raise an import error when a template from one of these packages is
actually used.
-1.2a3 (2009-01-02)
+1.2a3 (2009-12-02)
==================
Bug Fixes
diff --git a/docs/conf.py b/docs/conf.py
index a546698ad..d9c32a172 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -51,7 +51,7 @@ copyright = '2008-2009, Agendaless Consulting'
# other places throughout the built documents.
#
# The short X.Y version.
-version = '1.2a3'
+version = '1.2a4'
# The full version, including alpha/beta/rc tags.
release = version
diff --git a/setup.py b/setup.py
index 4e05ba443..1cb62ae9e 100644
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,7 @@
#
##############################################################################
-__version__ = '1.2a3'
+__version__ = '1.2a4'
import os
import sys