summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@agendaless.com>2009-06-30 23:03:15 +0000
committerChris McDonough <chrism@agendaless.com>2009-06-30 23:03:15 +0000
commitcc0bc9b032d59c740dbf27fdb46cd6a541f8df47 (patch)
tree4782d2ba7241394d7e8bb51a50fb5280a3d91482
parentcb63a04d20f6f65f4b82cb44d32715d0e394c023 (diff)
downloadpyramid-cc0bc9b032d59c740dbf27fdb46cd6a541f8df47.tar.gz
pyramid-cc0bc9b032d59c740dbf27fdb46cd6a541f8df47.tar.bz2
pyramid-cc0bc9b032d59c740dbf27fdb46cd6a541f8df47.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 5a395c325..61458163c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,8 @@
+Next release
+============
+
+- ...
+
1.0a7 (2009-06-30)
==================
diff --git a/docs/conf.py b/docs/conf.py
index 3477dfd6e..aebafd768 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -51,9 +51,9 @@ copyright = '2008-2009, Agendaless Consulting'
# other places throughout the built documents.
#
# The short X.Y version.
-version = '1.0a7'
+version = '1.0dev'
# The full version, including alpha/beta/rc tags.
-release = '1.0a7'
+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 a5b3be246..e10ed2ae2 100644
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,7 @@
#
##############################################################################
-__version__ = '1.0a7'
+__version__ = '1.0dev'
import os