From 80e661f8a5dcfde6c2415ca24471b308e3d3da98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 20 Apr 2015 15:51:27 +0200 Subject: [PATCH] Prepare release 3.6.0 --- CHANGELOG | 2 ++ COPYRIGHT | 6 +++--- tryton.cfg | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index af64d19fa7..7cc74b7f79 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,5 @@ +Version 3.6.0 - 2015-04-20 +* Bug fixes (see mercurial logs for details) * Add support for PyPy Version 3.4.0 - 2014-10-20 * Bug fixes (see mercurial logs for details) diff --git a/COPYRIGHT b/COPYRIGHT index 2687aff2ea..501e672bd9 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -1,7 +1,7 @@ -Copyright (C) 2011-2014 Cédric Krier. +Copyright (C) 2011-2015 Cédric Krier. Copyright (C) 2011-2013 Bertrand Chenal. -Copyright (C) 2011 Nicolas Évrard. -Copyright (C) 2011-2014 B2CK SPRL. +Copyright (C) 2011-2015 Nicolas Évrard. +Copyright (C) 2011-2015 B2CK SPRL. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/tryton.cfg b/tryton.cfg index cb6014ebbe..d852f28763 100644 --- a/tryton.cfg +++ b/tryton.cfg @@ -1,5 +1,5 @@ [tryton] -version=3.5.0 +version=3.6.0 depends: carrier company