This is an automated email from the git hooks/post-receive script. glondu pushed a commit to branch master in repository cppo.
commit 4903f554a8ceeedba25cc06f6db7d50240aaa8ab Merge: e883d94 1283a0a Author: Stephane Glondu <st...@glondu.net> Date: Tue Jan 26 15:48:33 2016 +0100 Merge tag 'upstream/1.3.1' Upstream version 1.3.1 INSTALL.md | 23 ++++++++++ Makefile | 6 +-- README.md | 11 ++++- cppo_eval.ml | 4 +- cppo_lexer.mll | 27 +++++++++++- cppo_main.ml | 6 +-- cppo_parser.mly | 82 +++++++++++++++++++++++------------- cppo_types.ml | 8 ++++ ocamlbuild_plugin/ocamlbuild_cppo.ml | 24 ++++++----- test.cppo | 8 ++-- test/Makefile | 16 ++++++- test/cond.ref | 17 ++++++++ test/loc.cppo | 8 ++++ test/loc.ref | 21 +++++++++ test/paren_arg.cppo | 3 ++ test/paren_arg.ref | 4 ++ test/tuple.ref | 20 +++++++++ test/unmatched.cppo | 14 ++++++ test/unmatched.ref | 15 +++++++ 19 files changed, 260 insertions(+), 57 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/cppo.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