This is an automated email from the git hooks/post-receive script.
infinity0 pushed a commit to branch master
in repository camlp4.
commit 85ce09fd9d5b224be15c7c4ae26d7e51f11a30a3
Merge: 31ec3ec 78d745a
Author: Ximin Luo <infini...@debian.org>
Date: Fri Mar 3 20:33:53 2017 +0100
Merge tag 'upstream/4.04+1'
Upstream version 4.04+1
# gpg: Signature made Fri 03 Mar 2017 20:33:53 CET
# gpg: using RSA key 3667486A326DB2766D255546860DEF3B8F650B79
# gpg: Good signature from "Ximin Luo <infini...@pwned.gg>" [ultimate]
# gpg: aka "Ximin Luo <infini...@torproject.org>" [ultimate]
# gpg: aka "Ximin Luo <infini...@freenetproject.org>"
[ultimate]
# gpg: aka "Ximin Luo <infini...@debian.org>" [ultimate]
# gpg: aka "Satoshi Nakamoto (www.bitcoin.org)
<satos...@gmx.com>" [ultimate]
.travis-ci.sh | 11 ++++++++-
CHANGES.md | 23 ++++++++++++++-----
_tags | 2 +-
camlp4/Camlp4/Struct/Camlp4Ast2OCamlAst.ml | 9 ++++----
camlp4/Camlp4/Struct/Lexer.mll | 11 +++++----
camlp4/Camlp4Parsers/Camlp4AstLoader.ml | 12 +++++-----
camlp4/Camlp4Parsers/Camlp4OCamlRevisedParser.ml | 29 ++++++++++++++++++++----
camlp4/boot/Camlp4.ml | 11 +++++----
configure | 4 ++--
9 files changed, 78 insertions(+), 34 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-ocaml-maint/packages/camlp4.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
