From 57c015ec23abde55c54042f228562d82ed9150f8 Mon Sep 17 00:00:00 2001
From: Gabriel Scherer <gabriel.scherer@gmail.com>
Date: Sun, 21 Dec 2014 08:26:21 +0000
Subject: [PATCH] update Changes after cherry-picking from trunk to 4.02

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@15717 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
---
 Changes | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/Changes b/Changes
index 338620878..1c1f9b2aa 100644
--- a/Changes
+++ b/Changes
@@ -42,11 +42,23 @@ Type system:
   type through inference, but no breakage known on published code.
 - PR#6593: Functor application in tests/basic-modules fails after commit 15405
 
+Bug fixes:
+- PR#6560: Wrong failure message for {Int32,Int64,NativeInt}.of_string
+  (Maxime Dénès and Gabriel Scherer)
+- PR#6648: show_module should indicate its elision
+- PR#6650: Cty_constr not handled correctly by Subst
+- PR#6651: Failing component lookup
+
+OCaml 4.02.2:
+-------------
+
 Toplevel and debugger:
 - PR#5958: generalized polymorphic #install_printer
   (Pierre Chambart and Grégoire Henry)
 
 OCamlbuild:
+- PR#6237: explicit "infer" tag to control or disable menhir --infer
+  (Hugo Heuzard)
 - PR#6702: explicit "linkpkg" and "dontlink(foo)" flags
   (Peter Zotov, Gabriel Scherer)
 - PR#6712: Ignore common VCS directories
@@ -57,19 +69,6 @@ OCamlbuild:
 Bug fixes:
 - PR#5836, PR#6684: printing lazy values in ocamldebug may segfault
   (Gabriel Scherer)
-- PR#6560: Wrong failure message for {Int32,Int64,NativeInt}.of_string
-  (Maxime Dénès and Gabriel Scherer)
-- PR#6648: show_module should indicate its elision
-- PR#6650: Cty_constr not handled correctly by Subst
-- PR#6651: Failing component lookup
-- PR#6717: Pprintast does not print let-pattern attributes
-  (Gabriel Scherer, report by Peter Zotov)
-- allow android build with pthreads support (since SDK r10c)
-  (Peter Zotov)
-
-OCaml 4.02.2:
--------------
-
 - PR#6628: Configure script rejects legitimate arguments
   (Michael Grünewald, Damien Doligez)
 - PR#6640: ocamlbuild: wrong "unused tag" warning on "precious"
@@ -81,6 +80,10 @@ OCaml 4.02.2:
 - PR#6680: Missing parentheses when printing polymorphic variant value in warning
 - PR#6690: Uncaught exception (Not_found) with (wrong) wildcard or unification
            type variable in place of a local abstract type
+- PR#6717: Pprintast does not print let-pattern attributes
+  (Gabriel Scherer, report by Peter Zotov)
+- allow android build with pthreads support (since SDK r10c)
+  (Peter Zotov)
 
 
 OCaml 4.02.1: