summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorGuenther Deschner <gd@samba.org>2007-10-11 02:33:07 +0200
committerGuenther Deschner <gd@samba.org>2007-10-11 02:33:07 +0200
commit31152a498191f2dba07d730ed176fc59e8bd48ca (patch)
treef334f7801595a64df2913b86c3dc3342e289989e /source3
parentf28dc0280dde74ae9512a00b6c4e276f8d78a55d (diff)
parenteb7a53a5569775da53bf8e42275cf613b555e0f2 (diff)
downloadsamba-31152a498191f2dba07d730ed176fc59e8bd48ca.tar.gz
samba-31152a498191f2dba07d730ed176fc59e8bd48ca.tar.bz2
samba-31152a498191f2dba07d730ed176fc59e8bd48ca.zip
Merge commit 'origin/v3-2-test' into my_branch
(This used to be commit 83fe2b4261f0357a62ea93b806a14225173f4945)
Diffstat (limited to 'source3')
-rw-r--r--source3/VERSION4
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/VERSION b/source3/VERSION
index 72764299f5..5e10dc79f3 100644
--- a/source3/VERSION
+++ b/source3/VERSION
@@ -46,7 +46,7 @@ SAMBA_VERSION_REVISION=
# e.g. SAMBA_VERSION_PRE_RELEASE=1 #
# -> "2.2.9pre1" #
########################################################
-SAMBA_VERSION_PRE_RELEASE=1
+SAMBA_VERSION_PRE_RELEASE=2
########################################################
# For 'rc' releases the version will be #
@@ -95,5 +95,5 @@ SAMBA_VERSION_IS_SVN_SNAPSHOT=yes
# e.g. SAMBA_VERSION_VENDOR_SUFFIX=vendor_version() #
# -> "CVS 3.0.0rc2-VendorVersion" #
########################################################
-SAMBA_VERSION_VENDOR_SUFFIX=
+SAMBA_VERSION_VENDOR_SUFFIX="-test"
SAMBA_VENDOR_PATCH=