diff --git a/CHANGELOG b/CHANGELOG index 11b1bddee0..41e964a0e7 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,5 @@ +Version 2.2.0 - 2011-10-24 +* Bug fixes (see mercurial logs for details) * New search widget * Improve memory management of Binary fields * Support buffer for Binary fields diff --git a/doc/conf.py b/doc/conf.py index 5525b7f579..afa0e453fb 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -48,9 +48,9 @@ copyright = u'2008-2011, Anne Krings, Bertrand Chenal, Cédric Krier, \ # built documents. # # The short X.Y version. -version = '2.1' +version = '2.2' # The full version, including alpha/beta/rc tags. -release = '2.1' +release = '2.2' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/tryton/version.py b/tryton/version.py index 86d5c6c6da..45ecaae4af 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 = "2.1.0" +VERSION = "2.2.0" LICENSE = "GPL-3" WEBSITE = "http://www.tryton.org/"