diff options
author | Jeremy Allison <jra@samba.org> | 2007-10-10 17:28:21 -0700 |
---|---|---|
committer | Jeremy Allison <jra@samba.org> | 2007-10-10 17:28:21 -0700 |
commit | d588123885b8c90f2fea4e0c2e35fee9db5231a6 (patch) | |
tree | ad74ed0891e8a83d1f93036ddb38efec6861e864 /source3 | |
parent | 39d30c54995b93c095dd8e367cff756c8a4b6e7f (diff) | |
parent | eb7a53a5569775da53bf8e42275cf613b555e0f2 (diff) | |
download | samba-d588123885b8c90f2fea4e0c2e35fee9db5231a6.tar.gz samba-d588123885b8c90f2fea4e0c2e35fee9db5231a6.tar.bz2 samba-d588123885b8c90f2fea4e0c2e35fee9db5231a6.zip |
Merge branch 'v3-2-test' of git://git.samba.org/samba into SAMBA_3_2
(This used to be commit e00ea359d66347a7c6f5d75de1670f788bfdc310)
Diffstat (limited to 'source3')
-rw-r--r-- | source3/VERSION | 4 |
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= |