This is an automated email from the git hooks/post-receive script. lifengsun-guest pushed a commit to branch master in repository sexplib310.
commit 73888a39a338396cbb4d93b60e95587617c405e8 Merge: 41a0b6a 5bac642 Author: Lifeng Sun <lifong...@gmail.com> Date: Fri Jan 10 22:37:17 2014 +0800 Merge tag 'upstream/109.58.00' Upstream version 109.58.00 Conflicts: INSTALL.txt Makefile _oasis _tags lib/META lib/pre_sexp.ml lib/sexp_with_layout.ml lib/sexplib.mlpack lib/sexplib.odocl lib_test/nonrec_test.ml lib_test/pa_sexp_test.ml lib_test/parser_test.ml myocamlbuild.ml setup.ml syntax/pa_sexp_conv.ml INSTALL.txt | 6 +- Makefile | 2 +- _oasis | 16 +- _tags | 62 +- configure | 4 +- lib/META | 14 +- lib/conv.ml | 58 +- lib/conv.mli | 32 - lib/macro.ml | 411 ++++++++++ lib/macro.mli | 172 +++++ lib/pre_sexp.ml | 79 +- lib/sexp_with_layout.ml | 2 +- lib/sexplib.mllib | 4 + lib/sexplib.mlpack | 3 +- lib/sexplib.odocl | 3 +- lib/std.ml | 30 +- lib_test/newlines.expected | 93 +++ lib_test/newlines.ml | 56 ++ lib_test/nonrec_test.ml | 75 ++ lib_test/pa_sexp_test.ml | 72 +- lib_test/parser_test.ml | 19 +- lib_test_ounit/test_macros.ml | 447 +++++++++++ lib_test_ounit/test_macros.mli | 10 + myocamlbuild.ml | 248 ++++-- num/lib/META | 12 + num/lib/sexplib_num.mllib | 1 + num/lib/sexplib_num.mlpack | 5 + num/lib/sexplib_num_conv.ml | 38 + num/lib/sexplib_num_conv.mli | 31 + num/lib/std.ml | 28 + setup.ml | 1658 ++++++++++++++++++++++++++++++++-------- syntax/pa_sexp_conv.ml | 99 ++- 32 files changed, 3180 insertions(+), 610 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/sexplib310.git _______________________________________________ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits