summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@agendaless.com>2010-07-26 00:39:10 +0000
committerChris McDonough <chrism@agendaless.com>2010-07-26 00:39:10 +0000
commitdef58d970a8862564c56dfca35640a7860be6d60 (patch)
tree8689eaf414613d4759dcd2063249e23fdc268c6c
parente4564566a2984ed991cd9aa64df055df1550b7f5 (diff)
downloadpyramid-def58d970a8862564c56dfca35640a7860be6d60.tar.gz
pyramid-def58d970a8862564c56dfca35640a7860be6d60.tar.bz2
pyramid-def58d970a8862564c56dfca35640a7860be6d60.zip
prep for 1.3a6
-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 67e794067..970ae7ecf 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,5 @@
-Next release
-============
+1.3a6 (2010-07-25)
+==================
Features
--------
diff --git a/docs/conf.py b/docs/conf.py
index d4c7a7786..efe507a2b 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -60,7 +60,7 @@ copyright = '2008-2010, Agendaless Consulting'
# other places throughout the built documents.
#
# The short X.Y version.
-version = '1.3a5'
+version = '1.3a6'
# The full version, including alpha/beta/rc tags.
release = version
diff --git a/setup.py b/setup.py
index aa6b8c35a..a058890d3 100644
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,7 @@
#
##############################################################################
-__version__ = '1.3a5'
+__version__ = '1.3a6'
import os
import sys