[Pkg-ocaml-maint-commits] [sexplib310] 02/04: Merge tag 'upstream/113.00.00'

[Hilko Bengen]

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

bengen pushed a commit to branch master
in repository sexplib310.

commit b878453ff05365974e70683d5c1c8fbf5db4b89a
Merge: c988f9a 15b2190
Author: Hilko Bengen <bengen at debian.org>
Date:   Thu Dec 24 17:49:41 2015 +0100

    Merge tag 'upstream/113.00.00'
    
    Upstream version 113.00.00

 CHANGES.md                                         |  34 +++
 COPYRIGHT.txt                                      |   2 +-
 README.md                                          |   2 +-
 _oasis                                             |  14 +-
 _tags                                              |  62 ++---
 lib/META                                           |   8 +-
 lib/conv.ml                                        | 123 ++-------
 lib/conv.mli                                       |  17 +-
 lib/exn_magic.ml                                   |  30 +--
 lib/macro.mli                                      |  47 ++--
 lib/parser.mly                                     |   2 +-
 lib/parser_with_layout.mly                         |   3 +-
 lib/pre_sexp.ml                                    |  14 +-
 {lib_test_ounit => lib_test}/test_macros.ml        |   6 +-
 {lib_test_ounit => lib_test}/test_macros.mli       |   0
 .../test_sexp_with_layout.ml                       |   0
 myocamlbuild.ml                                    |  92 ++++---
 num/lib/META                                       |   4 +-
 setup.ml                                           | 226 +++++++++-------
 syntax/pa_sexp_conv.ml                             | 286 +++++++++++++++------
 .../conv_test_deprecated.ml                        |   2 +-
 syntax_test/lib/conv_test.ml                       |  52 ++++
 {lib_test => syntax_test}/newlines.expected        |   0
 {lib_test => syntax_test}/newlines.ml              |   0
 {lib_test => syntax_test}/nonrec_test.ml           |   0
 {lib_test => syntax_test}/pa_sexp_test.ml          |  72 ++++--
 {lib_test => syntax_test}/parser_test.ml           |   1 +
 {lib_test => syntax_test}/printer_test.ml          |   0
 {lib_test => syntax_test}/sexp_test.ml             |   0
 {lib_test => syntax_test}/test.sexp                |   0
 {lib_test => syntax_test}/test_common.ml           |   0
 unix/lib/META                                      |   4 +-
 32 files changed, 655 insertions(+), 448 deletions(-)

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