diff --git a/CHANGELOG b/CHANGELOG index fc05596d7e..73d4beaa52 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,5 @@ +Version 2.6.0 - 2012-10-22 +* Bug fixes (see mercurial logs for details) * Allow to paste in editable list view * Manage readonly state on group * Remove "Please wait" box diff --git a/doc/conf.py b/doc/conf.py index 3934439465..7f6af8b81c 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -46,9 +46,9 @@ copyright = u'2008-2011, Anne Krings, Bertrand Chenal, Cédric Krier, \ # built documents. # # The short X.Y version. -version = '2.5' +version = '2.6' # The full version, including alpha/beta/rc tags. -release = '2.5' +release = '2.6' # 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 cbf00e9543..40db171ffc 100644 --- a/tryton/version.py +++ b/tryton/version.py @@ -1,6 +1,6 @@ #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.5.0" +VERSION = "2.6.0" LICENSE = "GPL-3" WEBSITE = "http://www.tryton.org/"