summaryrefslogtreecommitdiff
path: root/source4/VERSION
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2006-01-24 18:35:01 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:51:26 -0500
commitca649f797cdc08a28fe43d5b47f4c84967b22837 (patch)
tree441f5f8c452355ad7b34d68da1efc700ec90b66f /source4/VERSION
parentd5ae1a0387d281eeedc6c15f73df9dd13431a2bb (diff)
downloadsamba-ca649f797cdc08a28fe43d5b47f4c84967b22837.tar.gz
samba-ca649f797cdc08a28fe43d5b47f4c84967b22837.tar.bz2
samba-ca649f797cdc08a28fe43d5b47f4c84967b22837.zip
r13112: merge over some stuff from samba3
metze (This used to be commit 7cb4e1bd0471f0c03fde25f6171565d74ab0549f)
Diffstat (limited to 'source4/VERSION')
-rw-r--r--source4/VERSION9
1 files changed, 8 insertions, 1 deletions
diff --git a/source4/VERSION b/source4/VERSION
index c0b066cca1..fffd2a005e 100644
--- a/source4/VERSION
+++ b/source4/VERSION
@@ -1,6 +1,12 @@
########################################################
# SAMBA Version #
# #
+# Samba versions are as follows #
+# 3.0.x New production series #
+# 3.0.x{tp,pre,rc}y Preview/Testing & RC #
+# 3.0.x[a-z] Patch releases #
+# 3.0.x[a-z]-VENDOR-z Vendor patch releases #
+# #
# script/mkversion.sh #
# will use this file to create #
# include/version.h #
@@ -38,7 +44,7 @@ SAMBA_VERSION_REVISION=
# #
# <MAJOR>.<MINOR>.<RELEASE>tp<TP_RELEASE> #
# #
-# e.g. SAMBA_VERSION_PRE_RELEASE=1 #
+# e.g. SAMBA_VERSION_TP_RELEASE=1 #
# -> "4.0.0tp1" #
########################################################
SAMBA_VERSION_TP_RELEASE=
@@ -110,3 +116,4 @@ SAMBA_VERSION_RELEASE_NICKNAME=
# -> "CVS 3.0.0rc2-VendorVersion" #
########################################################
SAMBA_VERSION_VENDOR_SUFFIX=
+SAMBA_VERSION_VENDOR_PATCH=