From fb8855b05d137369f6377c351a8d9ece04e73efa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 20 Apr 2009 11:23:08 +0200 Subject: [PATCH] Prepare release 1.2.0 --- CHANGELOG | 2 ++ doc/conf.py | 6 +++--- tryton/version.py | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 9b604b3b03..9b59a52acb 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,5 @@ +Version 1.2.0 - 2009-04-20 +* Bug fixes (see mercurial logs for details) * Make graph works also with datetime * Add edition on Many2Many * Fix open in csv export to use file actions diff --git a/doc/conf.py b/doc/conf.py index 760b2e4d61..9168de1ac1 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -43,9 +43,9 @@ copyright = '2008, B2CK' # other places throughout the built documents. # # The short X.Y version. -version = '1.1' +version = '' # The full version, including alpha/beta/rc tags. -release = '1.1.0' +release = '' # There are two options for replacing |today|: either, you set today to some # non-false value, then it is used: @@ -85,7 +85,7 @@ html_style = 'default.css' # The name for this set of Sphinx documents. If None, it defaults to # " v documentation". -html_title = 'Tryton 1.1: Client Documentation' +html_title = 'Tryton 1.2: Client Documentation' # The name of an image file (within the static path) to place at the top of # the sidebar. diff --git a/tryton/version.py b/tryton/version.py index 727a190cce..1e34b3b328 100644 --- a/tryton/version.py +++ b/tryton/version.py @@ -1,7 +1,7 @@ #This file is part of Tryton. The COPYRIGHT file at the top level of #this repository contains the full copyright notices and license terms. PACKAGE = "tryton" -VERSION = "1.1.0" +VERSION = "1.2.0" LICENSE = "GPL-3" WEBSITE = "http://www.tryton.org/"