summaryrefslogtreecommitdiff
path: root/bin/release.py
diff options
context:
space:
mode:
authorJay (Open ERP) <jvo@tinyerp.com>2010-05-11 20:09:54 +0530
committerJay (Open ERP) <jvo@tinyerp.com>2010-05-11 20:09:54 +0530
commit0c9ecbf429e0851db69589750de430cdc81e6fa3 (patch)
treead337dd814fea2f54160496414771f77aaf5437a /bin/release.py
parent505b63fe5f4aa59bc6eadc6e5585f0d2d7539aa0 (diff)
[MERGE] Merged the changelog upto 5.0.10
bzr revid: jvo@tinyerp.com-20100511143954-exhrzxidou2r3j2a
Diffstat (limited to 'bin/release.py')
-rw-r--r--bin/release.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/bin/release.py b/bin/release.py
index f5fde69f1a9..817994e7d46 100644
--- 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