summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2007-09-05 00:53:20 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 15:03:42 -0500
commit3b0e38f195bd44d29d2033654055b2ea1be3eb62 (patch)
tree0133bd37b9c66dbdf2d0c03b3063ff70dfa77bd1 /source4
parent1403d79fe3247daff70c7ad7f056a725bd0e5d0b (diff)
downloadsamba-3b0e38f195bd44d29d2033654055b2ea1be3eb62.tar.gz
samba-3b0e38f195bd44d29d2033654055b2ea1be3eb62.tar.bz2
samba-3b0e38f195bd44d29d2033654055b2ea1be3eb62.zip
r24959: Merge back changes from release branch, and set new VERSION on main tree.
Andrew Bartlett (This used to be commit 95e4d337338191913bc6d13a076667de6bf33aba)
Diffstat (limited to 'source4')
-rw-r--r--source4/VERSION2
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/VERSION b/source4/VERSION
index d0f02a62f5..18daa5163d 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=1
+SAMBA_VERSION_ALPHA_RELEASE=2
########################################################
# For 'pre' releases the version will be #