summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@agendaless.com>2009-12-18 18:10:51 +0000
committerChris McDonough <chrism@agendaless.com>2009-12-18 18:10:51 +0000
commit3809abb4c55ef98541158e4f58593c6c6011034f (patch)
tree2cbf0230e6938348993efe06ce20d3ddc1ca51aa
parentbc857e7e6e71a4001f03c608a18bac7dab36ccff (diff)
downloadpyramid-3809abb4c55ef98541158e4f58593c6c6011034f.tar.gz
pyramid-3809abb4c55ef98541158e4f58593c6c6011034f.tar.bz2
pyramid-3809abb4c55ef98541158e4f58593c6c6011034f.zip
Prep for 1.2a6.
-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 dab788233..412f32bc8 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,5 @@
-Next release
-============
+1.2a6 (2009-12-18)
+==================
Features
--------
diff --git a/docs/conf.py b/docs/conf.py
index 9a911d14b..70aa89c8a 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.2a5'
+version = '1.2a6'
# The full version, including alpha/beta/rc tags.
release = version
diff --git a/setup.py b/setup.py
index fd41a547b..996c65697 100644
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,7 @@
#
##############################################################################
-__version__ = '1.2a5'
+__version__ = '1.2a6'
import os
import sys