[Pkg-ocaml-maint-commits] [bin-prot] 02/03: Merge tag 'upstream/109.53.02'

[Lifeng Sun]

This is an automated email from the git hooks/post-receive script.

lifengsun-guest pushed a commit to branch master
in repository bin-prot.

commit 5cab9654e1e90353abf0102576212572f705a58d
Merge: d0103fa c667f2d
Author: Lifeng Sun <lifongsun at gmail.com>
Date:   Fri Jan 10 22:25:09 2014 +0800

    Merge tag 'upstream/109.53.02'
    
    Upstream version 109.53.02
    
    Conflicts:
    	INSTALL.txt
    	_oasis
    	_tags
    	lib/META
    	lib/binable.ml
    	lib/common_stubs.c
    	lib/common_stubs.h
    	lib/int64_emul.h
    	lib/int64_native.h
    	lib/libbin_prot_stubs.clib
    	lib/map_to_safe.ml
    	lib/read_c.ml
    	lib/read_c.mli
    	lib/read_ml.ml
    	lib/read_stubs.c
    	lib/std.ml
    	lib/type_class.ml
    	lib/unsafe_common.ml
    	lib/unsafe_common.mli
    	lib/unsafe_read_c.ml
    	lib/unsafe_read_c.mli
    	lib/unsafe_write_c.ml
    	lib/unsafe_write_c.mli
    	lib/utils.ml
    	lib/write_c.ml
    	lib/write_c.mli
    	lib/write_ml.ml
    	lib/write_stubs.c
    	lib_test/bin_prot_test.ml
    	lib_test/microbench.ml
    	myocamlbuild.ml
    	setup.ml
    	syntax/pa_bin_prot.ml

 INSTALL.txt                     |    4 +-
 _oasis                          |   21 +-
 _tags                           |   84 +-
 configure                       |    4 +-
 lib/META                        |   10 +-
 lib/bin_prot.mllib              |    4 +
 lib/bin_prot.mlpack             |   12 +-
 lib/bin_prot.odocl              |   12 +-
 lib/binable.ml                  |   24 +-
 lib/blit_stubs.c                |   88 +++
 lib/common.ml                   |   19 +-
 lib/common.mli                  |   18 +-
 lib/common_stubs.c              |  140 ----
 lib/common_stubs.h              |  224 ------
 lib/int64_emul.h                |  260 -------
 lib/int64_native.h              |   39 -
 lib/int_codes.mlh               |    8 +-
 lib/libbin_prot_stubs.clib      |    6 +-
 lib/map_to_safe.ml              |    9 -
 lib/read.ml                     |  705 +++++++++++++++++
 lib/{read_ml.mli => read.mli}   |    0
 lib/read_c.ml                   |  108 ---
 lib/read_c.mli                  |   88 ---
 lib/read_ml.ml                  |  538 -------------
 lib/read_stubs.c                |  698 -----------------
 lib/std.ml                      |  230 +++---
 lib/type_class.ml               |   73 +-
 lib/type_class.mli              |    8 +-
 lib/unsafe_common.ml            |   51 --
 lib/unsafe_common.mli           |   91 ---
 lib/unsafe_read_c.ml            |  191 -----
 lib/unsafe_read_c.mli           |   61 --
 lib/unsafe_write_c.ml           |  156 ----
 lib/unsafe_write_c.mli          |   92 ---
 lib/utils.ml                    |  235 ++----
 lib/utils.mli                   |   12 +-
 lib/write.ml                    |  458 +++++++++++
 lib/{write_ml.mli => write.mli} |    0
 lib/write_c.ml                  |   87 ---
 lib/write_c.mli                 |   83 --
 lib/write_ml.ml                 |  294 -------
 lib/write_stubs.c               |  594 --------------
 lib_test/bin_prot_test.ml       | 1450 ++++++++++++++++------------------
 lib_test/microbench.ml          |   60 +-
 lib_test/test.ml                |    3 +-
 myocamlbuild.ml                 |  249 +++---
 setup.ml                        | 1639 +++++++++++++++++++++++++++++++--------
 syntax/pa_bin_prot.ml           |  531 +++++--------
 48 files changed, 3905 insertions(+), 5866 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/bin-prot.git