summaryrefslogtreecommitdiff
path: root/bin/release.py
diff options
context:
space:
mode:
authorYogesh Sakhreliya <ysa@tinyerp.com>2011-01-04 11:19:25 +0530
committerYogesh Sakhreliya <ysa@tinyerp.com>2011-01-04 11:19:25 +0530
commitbf5765b3ef0f22dcbca413e86fc39dfef9f1d87f (patch)
treea848eec82d13175afe8bfa7fe87f02582b583dcc /bin/release.py
parent3acdf9f9c12ac0acd25f9ff106568e585199b3f8 (diff)
parentac3f37be8fd77b207baad3ca6978eb576aa8a204 (diff)
Merge with trunk-server
bzr revid: ysa@tinyerp.com-20110104054925-mhs1vnkyqs7z6yy6
Diffstat (limited to 'bin/release.py')
-rw-r--r--bin/release.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/release.py b/bin/release.py
index 1683db52ba4..ea830cd2205 100644
--- a/bin/release.py
+++ b/bin/release.py
@@ -21,7 +21,7 @@
##############################################################################
name = 'openerp-server'
-version = '6.0.0-rc1'
+version = '6.0.0-rc2'
major_version = '6.0'
description = 'OpenERP Server'
long_desc = '''OpenERP is a complete ERP and CRM. The main features are accounting (analytic