preparing 3.11.2+rc1

git-svn-id: http://caml.inria.fr/svn/ocaml/version/3.11@9482 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02

3 files changed, 17 insertions, 2 deletions

diff --git a/Changes b/Changes
index 2be28b7f38..20715dad90 100644
--- a/Changes
+++ b/Changes
@@ -2,32 +2,45 @@ Objective Caml 3.11.2:
 ----------------------
 
 Bug fixes:
+- PR#4151: better documentation for min and max w.r.t. NaN
 - PR#4421: ocamlbuild uses wrong compiler for C files
 - PR#4710, PR#4720: ocamlbuild does not use properly configuration information
 - PR#4750: under some Windows installations, high start-up times for Unix lib
+- PR#4777: problem with scanf and CRLF
 - PR#4810: BSD problem with socket addresses, e.g. in Unix.getnameinfo
 - PR#4813: issue with parsing of float literals by the GNU assembler
+- PR#4816: problem with modules and private types
 - PR#4818: missed opportunity for type-based optimization of bigarray accesses
+- PR#4821: check for duplicate method names in classes
+- PR#4823: build problem on Mac OS X
 - PR#4836: spurious errors raised by Unix.single_write under Windows
-- PR#4930, PR#4841, PR#4860: problem with ocamlopt -output-obj under Mac OS X
+- PR#4841, PR#4860, PR#4930: problem with ocamlopt -output-obj under Mac OS X
 - PR#4847: C compiler error with ocamlc -output-obj under Win64
 - PR#4856: ocamlbuild uses ocamlrun to execute a native plugin
+- PR#4867, PR#4760: ocamlopt -shared fails on Mac OS X 64bit
 - PR#4873: ocamlbuild ignores "thread" tag when building a custom toplevel
 - PR#4890: ocamlbuild tries to use native plugin on bytecode-only arch
 - PR#4896: ocamlbuild should always pass -I to tools for external libraries
 - PR#4900: small bug triggering automatic compaction even if max_overhead = 1M
 - PR#4902: bug in %.0F printf format
+- PR#4910: problem with format concatenation
 - PR#4922: ocamlbuild recompiles too many files
+- PR#4923: missing \xff for scanf %S
+- PR#4933: functors not handling private types correctly
 - Module Printf: the simple conversion %F (without width indication) was not
            treated properly.
+- Makefile: problem with cygwin, flexdll, and symbolic links
 
 Feature wishes:
+- PR#9: (tentative implementation) make ocamldebug use #linenum annotations
 - PR#123, PR#4477: custom exception printers
 - PR#3456: Obj.double_field and Obj.set_double_field functions
 - PR#4003: destination directory can be given to Filename.[open_]temp_file
 - PR#4647: Buffer.blit function
 - PR#4685: access to Filename.dir_sep
+- PR#4703: support for debugging embedded applications
 - PR#4723: "clear_rules" function to empty the set of ocamlbuild rules
+- PR#4921: configure option to help cross-compilers
 
 Objective Caml 3.11.1:
 ----------------------
diff --git a/stdlib/obj.ml b/stdlib/obj.ml
index a5c108796d..922febd65c 100644
--- a/stdlib/obj.ml
+++ b/stdlib/obj.ml
@@ -32,6 +32,7 @@ let set_double_field x i v = Array.set (obj x : float array) i v
 external new_block : int -> int -> t = "caml_obj_block"
 external dup : t -> t = "caml_obj_dup"
 external truncate : t -> int -> unit = "caml_obj_truncate"
+external add_offset : t -> int -> t = "caml_obj_add_offset"
 
 let marshal (obj : t) =
   Marshal.to_string obj []
diff --git a/stdlib/obj.mli b/stdlib/obj.mli
index 7003e39f36..34b78fdb4a 100644
--- a/stdlib/obj.mli
+++ b/stdlib/obj.mli
@@ -28,13 +28,14 @@ external is_int : t -> bool = "%obj_is_int"
 external tag : t -> int = "caml_obj_tag"
 external set_tag : t -> int -> unit = "caml_obj_set_tag"
 external size : t -> int = "%obj_size"
-external truncate : t -> int -> unit = "caml_obj_truncate"
 external field : t -> int -> t = "%obj_field"
 external set_field : t -> int -> t -> unit = "%obj_set_field"
 val double_field : t -> int -> float
 val set_double_field : t -> int -> float -> unit
 external new_block : int -> int -> t = "caml_obj_block"
 external dup : t -> t = "caml_obj_dup"
+external truncate : t -> int -> unit = "caml_obj_truncate"
+external add_offset : t -> int -> t = "caml_obj_add_offset"
 
 val lazy_tag : int
 val closure_tag : int