Skip to content
Browse files

prep for 1.2

  • Loading branch information...
1 parent 6a7931f commit 63f65dbfcb5e7ef7864f8a954849597ba07a0299 @mcdonc mcdonc committed Sep 12, 2011
Showing with 4 additions and 4 deletions.
  1. +2 −2 CHANGES.txt
  2. +1 −1 docs/conf.py
  3. +1 −1 setup.py
View
4 CHANGES.txt
@@ -1,5 +1,5 @@
-Next release
-============
+1.2 (2011-09-12)
+================
Features
--------
View
2 docs/conf.py
@@ -93,7 +93,7 @@ def nothing(*arg):
# other places throughout the built documents.
#
# The short X.Y version.
-version = '1.2b3'
+version = '1.2'
# The full version, including alpha/beta/rc tags.
release = version
View
2 setup.py
@@ -52,7 +52,7 @@
install_requires.append('simplejson')
setup(name='pyramid',
- version='1.2b3',
+ version='1.2',
description=('The Pyramid web application development framework, a '
'Pylons project'),
long_description=README + '\n\n' + CHANGES,

0 comments on commit 63f65db

Please sign in to comment.
Something went wrong with that request. Please try again.