[Pkg-ocaml-maint-commits] [sexplib310] 07/08: Merge tag 'upstream/111.17.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 05f5afa5b5c5ef6217303e28bf312d7535a1b5c3
Merge: 8f4682b c9a0aa8
Author: Lifeng Sun <lifongsun at gmail.com>
Date:   Tue Jul 15 12:37:28 2014 +0800

    Merge tag 'upstream/111.17.00'
    
    Upstream version 111.17.00

 CHANGES.md                    | 511 ++++++++++++++++++++++++++++++++++++++++
 CHANGES.txt                   | 267 ---------------------
 INSTALL.txt                   |   4 +-
 _oasis                        |  16 +-
 _tags                         |  38 +--
 lib/META                      |  14 +-
 lib/macro.ml                  |  72 ++++--
 lib/sexplib.mldylib           |   4 +
 lib/std.ml                    |   2 +-
 lib_test/pa_sexp_test.ml      |   8 +
 lib_test_ounit/test_macros.ml |  17 +-
 myocamlbuild.ml               | 146 +++++++-----
 num/lib/META                  |   4 +-
 num/lib/sexplib_num.mldylib   |   4 +
 setup.ml                      | 525 +++++++++++++++++++++++++-----------------
 syntax/pa_sexp_conv.mldylib   |   4 +
 top/sexplib_top.mldylib       |   4 +
 unix/lib/META                 |   4 +-
 unix/lib/sexplib_unix.mldylib |   4 +
 19 files changed, 1054 insertions(+), 594 deletions(-)

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