From 4e27f95497f95d9d2e51a31e29ab952ad6743f3d Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@agendaless.com>
Date: Wed, 10 Feb 2010 05:01:37 +0000
Subject: Prep for 1.2 final.

---
 CHANGES.txt  | 5 +++++
 docs/conf.py | 2 +-
 setup.py     | 6 +++---
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index c44400014..7833eb35f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,8 @@
+1.2 (2010-02-10)
+================
+
+- No changes from 1.2b6.
+
 1.2b6 (2010-02-06)
 ==================
 
diff --git a/docs/conf.py b/docs/conf.py
index 53e2d671c..fb2e0adbf 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -53,7 +53,7 @@ copyright = '2008-2010, Agendaless Consulting'
 # other places throughout the built documents.
 #
 # The short X.Y version.
-version = '1.2b6'
+version = '1.2'
 # The full version, including alpha/beta/rc tags.
 release = version
 
diff --git a/setup.py b/setup.py
index 8b84d9cb4..07fb1c61b 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2008 Agendaless Consulting and Contributors.
+# Copyright (c) 2008-2010 Agendaless Consulting and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the BSD-like license at
@@ -12,7 +12,7 @@
 #
 ##############################################################################
 
-__version__ = '1.2b6'
+__version__ = '1.2'
 
 import os
 import sys
@@ -31,7 +31,7 @@ install_requires=[
     'Paste > 1.7', # temp version pin to prevent PyPi install failure :-(
     'PasteDeploy',
     'PasteScript',
-    'WebOb>=0.9.7', # "default_charset" 
+    'WebOb >= 0.9.7', # "default_charset" 
     'repoze.lru',
     'setuptools',
     'zope.component >= 3.6.0', # independent of zope.hookable
-- 
cgit v1.2.3