[Pkg-ocaml-maint-commits] [sexplib310] 04/08: Merge tag 'upstream/111.03.00'

[Lifeng Sun]

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

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

commit 8cc8c2f68d401eb75fbb032c04a1c2cb44d4fb0a
Merge: b86387d 86a1753
Author: Lifeng Sun <lifongsun at gmail.com>
Date:   Sat Apr 12 16:21:28 2014 +0800

    Merge tag 'upstream/111.03.00'
    
    Upstream version 111.03.00
    
    Conflicts:
    	INSTALL.txt
    	_oasis
    	_tags
    	lib/META
    	lib/macro.ml
    	lib/macro.mli
    	lib/sexp_intf.ml
    	lib/type_with_layout.mli
    	lib_test/pa_sexp_test.ml
    	lib_test_ounit/test_macros.ml
    	myocamlbuild.ml
    	num/lib/META
    	setup.ml
    	syntax/pa_sexp_conv.ml

 INSTALL.txt                   |  4 +-
 _oasis                        | 20 ++++-----
 _tags                         | 15 +++----
 lib/META                      | 10 ++---
 lib/conv.ml                   |  7 ----
 lib/macro.ml                  | 27 +++++++-----
 lib/macro.mli                 | 18 +++++---
 lib/sexp_intf.ml              |  2 +-
 lib/sexplib.odocl             | 19 ---------
 lib/type_with_layout.mli      |  2 +-
 lib_test/pa_sexp_test.ml      | 17 ++++++--
 lib_test_ounit/test_macros.ml | 38 +++++++++++++++--
 myocamlbuild.ml               | 11 +++--
 num/lib/META                  |  4 +-
 setup.ml                      | 87 +++++++++++++++++++-------------------
 syntax/pa_sexp_conv.ml        | 98 +++++++++++++++++++++++--------------------
 unix/lib/META                 | 12 ++++++
 unix/lib/sexplib_unix.mllib   |  4 ++
 unix/lib/sexplib_unix.mlpack  |  4 ++
 unix/lib/sexplib_unix_conv.ml | 18 ++++++++
 20 files changed, 249 insertions(+), 168 deletions(-)

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