summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2008-06-30 21:54:01 +1000
committerAndrew Bartlett <abartlet@samba.org>2008-06-30 21:54:01 +1000
commit5d2dea38d6bb0e2643ffcecaada0df9ac6a42050 (patch)
treee66c67ccdf94b411cd347663234b50ed8d1c1a92
parentb3e202ef8cf797a79cf2b2de863db9fcc7d3b1c3 (diff)
parentd4942363bad0488e38c8a42252e060591d6615a9 (diff)
downloadsamba-5d2dea38d6bb0e2643ffcecaada0df9ac6a42050.tar.gz
samba-5d2dea38d6bb0e2643ffcecaada0df9ac6a42050.tar.bz2
samba-5d2dea38d6bb0e2643ffcecaada0df9ac6a42050.zip
Merge branch '4-0-stable' into 4-0-local
(This used to be commit 857df6e91874407f70436749e3dad13ada003e6e)
-rw-r--r--source4/VERSION2
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/VERSION b/source4/VERSION
index 7a526c625e..cd9968a4ef 100644
--- a/source4/VERSION
+++ b/source4/VERSION
@@ -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 #