summaryrefslogtreecommitdiff
path: root/VERSION
diff options
context:
space:
mode:
authorDamien Doligez <damien.doligez-inria.fr>2013-09-12 15:21:52 +0000
committerDamien Doligez <damien.doligez-inria.fr>2013-09-12 15:21:52 +0000
commitfadcc73c50b89ca80ecc11131c9a23dbd2c1e67a (patch)
tree2513e4063d5cd55c981ed1b72d5bb86a48266782 /VERSION
parent3501cb4d96df0704b3e20902dab82325fd3aa263 (diff)
downloadocaml-fadcc73c50b89ca80ecc11131c9a23dbd2c1e67a.tar.gz
Merge branch 4.01 from 4.01.0+rc1 to 4.01.0
Command line used: svn merge --accept postpone -r 14055:14115 $REPO/version/4.01 . git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@14121 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'VERSION')
-rw-r--r--VERSION2
1 files changed, 1 insertions, 1 deletions
diff --git a/VERSION b/VERSION
index 7e8eb04fa0..903644899f 100644
--- a/VERSION
+++ b/VERSION
@@ -1,4 +1,4 @@
-4.02.0+dev1-2013-09-04
+4.02.0+dev2-2013-09-12
# The version string is the first line of this file.
# It must be in the format described in stdlib/sys.mli