summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@agendaless.com>2009-12-20 14:09:46 +0000
committerChris McDonough <chrism@agendaless.com>2009-12-20 14:09:46 +0000
commit189537ca0087658811713d9273a4edcb76d6ffa6 (patch)
tree28a042c6d410ddd5ae0f88ebd3b0e954e3e604b9
parent624aa87a7975b964e1b63f58ead1d19ed0b7a062 (diff)
downloadpyramid-189537ca0087658811713d9273a4edcb76d6ffa6.tar.gz
pyramid-189537ca0087658811713d9273a4edcb76d6ffa6.tar.bz2
pyramid-189537ca0087658811713d9273a4edcb76d6ffa6.zip
Prep for 1.2a7.
-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 40808059a..fc7fa1697 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,5 @@
-Next release
-============
+1.2a7 (2009-12-20)
+==================
Features
--------
diff --git a/docs/conf.py b/docs/conf.py
index 70aa89c8a..a6bade1bd 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.2a6'
+version = '1.2a7'
# The full version, including alpha/beta/rc tags.
release = version
diff --git a/setup.py b/setup.py
index 996c65697..85dcd5d3a 100644
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,7 @@
#
##############################################################################
-__version__ = '1.2a6'
+__version__ = '1.2a7'
import os
import sys