summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@agendaless.com>2009-06-23 18:10:09 +0000
committerChris McDonough <chrism@agendaless.com>2009-06-23 18:10:09 +0000
commit3be7f7020bee65d724d89c9783484c41f21cceb2 (patch)
treeff77ac62baa04998c4d6b37412f477cab5e49f47
parentb274d06c23fdfc52f30d65217333adf1c51696c4 (diff)
downloadpyramid-3be7f7020bee65d724d89c9783484c41f21cceb2.tar.gz
pyramid-3be7f7020bee65d724d89c9783484c41f21cceb2.tar.bz2
pyramid-3be7f7020bee65d724d89c9783484c41f21cceb2.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 dc823d825..33c1282e7 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,8 @@
+Next release
+============
+
+- ...
+
1.0a2 (2009-06-23)
==================
diff --git a/docs/conf.py b/docs/conf.py
index d3618a330..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.0a2'
+version = '1.0dev'
# The full version, including alpha/beta/rc tags.
-release = '1.0a2'
+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 2b7a5fae0..766015d42 100644
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,7 @@
#
##############################################################################
-__version__ = '1.0a2'
+__version__ = '1.0dev'
import os