summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@agendaless.com>2009-06-22 06:22:53 +0000
committerChris McDonough <chrism@agendaless.com>2009-06-22 06:22:53 +0000
commit548d30eb11fbd081852139522d789fedc5683bf1 (patch)
tree56941c2ea5e59166ceb8d66ee6ad7bfce554f4ff
parent5aba6b1842694928ebd9ece902a42e406a9359aa (diff)
downloadpyramid-548d30eb11fbd081852139522d789fedc5683bf1.tar.gz
pyramid-548d30eb11fbd081852139522d789fedc5683bf1.tar.bz2
pyramid-548d30eb11fbd081852139522d789fedc5683bf1.zip
Back to dev.
-rw-r--r--CHANGES.txt5
-rw-r--r--docs/conf.py4
-rw-r--r--setup.py2
3 files changed, 8 insertions, 3 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index 8065946ab..b69653e3f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,8 @@
+Next release
+============
+
+- ...
+
1.0a1 (2009-06-22)
==================
diff --git a/docs/conf.py b/docs/conf.py
index 3100a7f15..ce14d69c0 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -51,9 +51,9 @@ copyright = '2008, Agendaless Consulting'
# other places throughout the built documents.
#
# The short X.Y version.
-version = '1.0a1'
+version = '1.0dev'
# The full version, including alpha/beta/rc tags.
-release = '1.0a1'
+release = '1.0dev'
# There are two options for replacing |today|: either, you set today to some
# non-false value, then it is used:
diff --git a/setup.py b/setup.py
index 1ac6208ca..766015d42 100644
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,7 @@
#
##############################################################################
-__version__ = '1.0a1'
+__version__ = '1.0dev'
import os