This is an automated email from the git hooks/post-receive script.
infinity0 pushed a commit to branch master
in repository camlp4.
commit 5fe4cc5f7ddb2079391064c4ed6eb3ab73340ff1
Merge: 9327aa9 2cfb48c
Author: Ximin Luo <infini...@debian.org>
Date: Thu Jul 6 22:13:40 2017 +0200
Merge tag 'upstream/4.05+1'
Upstream version 4.05+1
# gpg: Signature made Thu 06 Jul 2017 22:13:39 CEST
# 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 | 2 +-
Makefile | 10 +-
_tags | 2 +-
camlp4/Camlp4/ErrorHandler.ml | 8 +-
camlp4/Camlp4/Options.ml | 14 +-
camlp4/Camlp4/Struct/Camlp4Ast2OCamlAst.ml | 33 +-
camlp4/Camlp4/Struct/Quotation.ml | 3 +-
camlp4/Camlp4/Struct/Token.ml | 3 +-
camlp4/Camlp4Bin.ml | 2 +-
camlp4/Camlp4Filters/Camlp4Profiler.ml | 4 +-
camlp4/Camlp4Parsers/Camlp4AstLoader.ml | 18 +-
camlp4/Camlp4Parsers/Camlp4GrammarParser.ml | 4 +-
camlp4/Camlp4Top/Rprint.ml | 8 +-
camlp4/boot/Camlp4.ml | 3974 ++++++++++++++-------------
camlp4/mkcamlp4.ml | 2 +-
configure | 8 +-
16 files changed, 2045 insertions(+), 2050 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
