This is an automated email from the git hooks/post-receive script.
josch pushed a commit to branch master
in repository ocp-indent.
commit 30d5e05ca7b1d0b320270390f64d013535c27950
Merge: 006f8b9 c34f16d
Author: Johannes Schauer <jo...@debian.org>
Date: Wed Oct 12 13:54:43 2016 +0200
Merge tag 'upstream/1.5.3'
Upstream version 1.5.3
.gitignore | 4 +-
.ocp-indent | 8 ++
CHANGELOG | 6 ++
META | 8 +-
configure | 32 +++++---
configure.ac | 2 +-
install.sh | 7 --
opam | 2 +-
src/indentBlock.ml | 47 ++++++-----
tests/failing-output/escaped-nl.ml | 44 +++++++++++
tests/failing-output/indent-empty-numeric.ml | 10 +++
tests/failing-output/js-default.ml | 10 ---
tests/failing-output/list_of_funs.ml | 33 ++++++++
tests/failing.html | 109 +++++++++++++++++++++-----
tests/failing/escaped-nl.ml | 44 +++++++++++
tests/failing/escaped-nl.ml.ref | 44 +++++++++++
tests/failing/list_of_funs.ml | 33 ++++++++
tests/passing/comments.ml | 4 +
tests/passing/indent-empty-1.ml | 9 +++
tests/passing/indent-empty-1.ml.opts | 1 +
tests/passing/indent-empty-1.ml.ref | 1 +
tests/passing/indent-empty-nm.ml | 9 +++
tests/passing/indent-empty-nm.ml.opts | 1 +
tests/passing/indent-empty-nm.ml.ref | 10 +++
tests/passing/indent-empty.ml | 9 +++
tests/passing/indent-empty.ml.opts | 1 +
tests/passing/indent-empty.ml.ref | 10 +++
tests/{failing => passing}/js-default.ml | 5 ++
tests/{failing => passing}/js-default.ml.opts | 0
tests/passing/ppx_expr_ext.ml.opts | 1 +
tests/passing/ppx_stritem_ext.ml | 23 ++++++
tests/passing/semi.ml | 23 ++++++
tools/ocp-indent.el | 3 +
tools/ocp-indent.vim | 2 +-
uninstall.sh | 5 --
35 files changed, 480 insertions(+), 80 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-ocaml-maint/packages/ocp-indent.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
