summaryrefslogtreecommitdiffstats
path: root/source/VERSION
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2005-03-17 22:13:36 +0000
committerGerald Carter <jerry@samba.org>2005-03-17 22:13:36 +0000
commit7b804bdf24e71c91c594a4be47e64d569fddc4eb (patch)
tree012b5ae598cc1a787971d840f550a7ba4df1b049 /source/VERSION
parentdf807d2059a3712571a19442543a63880d3d6c3f (diff)
downloadsamba-7b804bdf24e71c91c594a4be47e64d569fddc4eb.tar.gz
samba-7b804bdf24e71c91c594a4be47e64d569fddc4eb.tar.xz
samba-7b804bdf24e71c91c594a4be47e64d569fddc4eb.zip
r5870: syncing up for 3.0.12
svn merge -r5740:5743 $SVNURL/branches/SAMBA_3_0 svn merge -r5743:5746 $SVNURL/branches/SAMBA_3_0 svn merge -r5746:5749 $SVNURL/branches/SAMBA_3_0 svn merge -r5749:5751 $SVNURL/branches/SAMBA_3_0 svn merge -r5751:5752 $SVNURL/branches/SAMBA_3_0 svn merge -r5752:5757 $SVNURL/branches/SAMBA_3_0 svn merge -r5757:5759 $SVNURL/branches/SAMBA_3_0 svn merge -r5759:5760 $SVNURL/branches/SAMBA_3_0 svn merge -r5760:5762 $SVNURL/branches/SAMBA_3_0 svn merge -r5770:5776 $SVNURL/branches/SAMBA_3_0 svn merge -r5776:5786 $SVNURL/branches/SAMBA_3_0 svn merge -r5786:5789 $SVNURL/branches/SAMBA_3_0 svn merge -r5789:5790 $SVNURL/branches/SAMBA_3_0 svn merge -r5792:5804 $SVNURL/branches/SAMBA_3_0 svn merge -r5809:5812 $SVNURL/branches/SAMBA_3_0 svn merge -r5812:5813 $SVNURL/branches/SAMBA_3_0 svn merge -r5813:5816 $SVNURL/branches/SAMBA_3_0 svn merge -r5816:5817 $SVNURL/branches/SAMBA_3_0 svn merge -r5817:5820 $SVNURL/branches/SAMBA_3_0 svn merge -r5820:5825 $SVNURL/branches/SAMBA_3_0 svn merge -r5833:5835 $SVNURL/branches/SAMBA_3_0 svn merge -r5835:5836 $SVNURL/branches/SAMBA_3_0 svn merge -r5836:5840 $SVNURL/branches/SAMBA_3_0 svn merge -r5840:5843 $SVNURL/branches/SAMBA_3_0 svn merge -r5843:5844 $SVNURL/branches/SAMBA_3_0 svn merge -r5844:5847 $SVNURL/branches/SAMBA_3_0 svn merge -r5848:5851 $SVNURL/branches/SAMBA_3_0 svn merge -r5851:5854 $SVNURL/branches/SAMBA_3_0
Diffstat (limited to 'source/VERSION')
-rw-r--r--source/VERSION2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/VERSION b/source/VERSION
index 99d75e80bdd..13c216d5554 100644
--- a/source/VERSION
+++ b/source/VERSION
@@ -39,7 +39,7 @@ SAMBA_VERSION_PRE_RELEASE=
# e.g. SAMBA_VERSION_RC_RELEASE=1 #
# -> "3.0.0rc1" #
########################################################
-SAMBA_VERSION_RC_RELEASE=1
+SAMBA_VERSION_RC_RELEASE=
########################################################
# To mark SVN snapshots this should be set to 'yes' #