summaryrefslogtreecommitdiff
path: root/source4/VERSION
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2010-09-20 15:24:44 -0700
committerJelmer Vernooij <jelmer@samba.org>2010-09-20 15:24:44 -0700
commitead126caace0cd94ab515f5d9f2199b60a84f914 (patch)
tree3778093012c4216674321416788072f497ac3a4b /source4/VERSION
parent8853babb504298bd87fb5cae2120f2be63b08312 (diff)
parentdb67f43aefccccedbd8bf59c7d97c99295b7a168 (diff)
downloadsamba-ead126caace0cd94ab515f5d9f2199b60a84f914.tar.gz
samba-ead126caace0cd94ab515f5d9f2199b60a84f914.tar.bz2
samba-ead126caace0cd94ab515f5d9f2199b60a84f914.zip
Merge branch 'v4-0-stable' into newmaster
Diffstat (limited to 'source4/VERSION')
-rw-r--r--source4/VERSION4
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/VERSION b/source4/VERSION
index 76e66da6bd..350367982e 100644
--- a/source4/VERSION
+++ b/source4/VERSION
@@ -57,7 +57,7 @@ SAMBA_VERSION_TP_RELEASE=
# e.g. SAMBA_VERSION_ALPHA_RELEASE=1 #
# -> "4.0.0alpha1" #
########################################################
-SAMBA_VERSION_ALPHA_RELEASE=12
+SAMBA_VERSION_ALPHA_RELEASE=13
########################################################
# For 'pre' releases the version will be #
@@ -89,7 +89,7 @@ SAMBA_VERSION_RC_RELEASE=
# e.g. SAMBA_VERSION_IS_SVN_SNAPSHOT=yes #
# -> "3.0.0-SVN-build-199" #
########################################################
-SAMBA_VERSION_IS_GIT_SNAPSHOT=yes
+SAMBA_VERSION_IS_GIT_SNAPSHOT=no
########################################################
# This is for specifying a release nickname #