[MERGE] Merged the changelog upto 5.0.10

bzr revid: jvo@tinyerp.com-20100511143954-exhrzxidou2r3j2a
2010-05-11 20:09:54 +05:30 · 2010-05-11 20:09:54 +05:30 · 0c9ecbf429
parent 505b63fe5f
commit 0c9ecbf429
3 changed files with 934 additions and 180 deletions
--- a/bin/release.py
+++ b/bin/release.py
@ -21,8 +21,8 @@
 ##############################################################################

 name = 'openerp-server'
-version = '5.2dev'
-major_version = '5.2'
+version = '6.0dev'
+major_version = '6.0'
 description = 'OpenERP Server'
 long_desc = '''\
 OpenERP is a complete ERP and CRM. The main features are accounting (analytic
--- a/doc/Changelog
+++ b/doc/Changelog
--- a/setup.cfg
+++ b/setup.cfg
@ -6,7 +6,7 @@ formats=rpm

 [bdist_rpm]
 # release must exactly match 'release' as set in bin/release.py
-release=3
+release=10

 requires=python >= 2.4
 #build-requires=python-devel >= 2.3