This is an automated email from the git hooks/post-receive script.
josch pushed a commit to branch master
in repository ocp-indent.
commit e475af254fd763633ac0dbeda60b88ed3727e74f
Merge: 9162402 40be3e3
Author: Johannes Schauer <jo...@debian.org>
Date: Tue Jan 26 09:17:47 2016 +0100
Merge tag 'upstream/1.5.2'
Upstream version 1.5.2
.gitignore | 3 +
CHANGELOG | 22 +
META | 12 +-
Makefile | 26 +-
Makefile.simple | 70 ++-
configure | 18 +-
configure.ac | 2 +-
doc/ocp-indent.md | 30 +-
install.sh | 114 +++++
ocp-indent.install | 6 +-
opam | 26 +-
src/approx_lexer.mll | 14 +-
src/approx_tokens.ml | 3 +
src/indentBlock.ml | 55 ++-
src/indentConfig.ml | 2 +-
src/indentConfig.mli | 3 +-
src/indentExtend.ml | 5 -
src/ocp-indent-lib.mllib | 1 -
tests/{passing => failing-output}/edge-cases.ml | 10 +
tests/failing-output/js-args.ml | 15 +-
tests/{passing => failing-output}/js-begin.ml | 0
tests/{passing => failing-output}/js-default.ml | 3 +-
tests/{passing => failing-output}/js-fun.ml | 0
tests/failing-output/js-functor.ml | 30 ++
tests/{passing => failing-output}/js-pattern.ml | 6 +
tests/failing-output/js-syntax.ml | 15 +
tests/failing.html | 530 ++++++++++++++++++---
tests/{passing => failing}/edge-cases.ml | 10 +
tests/failing/js-args.ml | 15 +-
tests/{passing => failing}/js-begin.ml | 2 +-
tests/{passing => failing}/js-begin.ml.opts | 0
tests/{passing => failing}/js-default.ml | 3 +-
tests/{passing => failing}/js-default.ml.opts | 0
tests/{passing => failing}/js-fun.ml | 4 +-
tests/{passing => failing}/js-fun.ml.opts | 0
tests/failing/js-functor.ml | 44 +-
tests/{passing => failing}/js-pattern.ml | 10 +-
tests/{passing => failing}/js-pattern.ml.opts | 0
tests/failing/js-syntax.ml | 15 +
tests/{passing => failing}/js-syntax.ml.opts | 0
tests/passing/extensible.ml | 39 ++
tests/passing/ifand.ml | 8 +-
tests/passing/js-applicative.ml | 12 +
.../{js-begin.ml.opts => js-applicative.ml.opts} | 0
tests/passing/js-model.ml | 6 -
tests/passing/js-poly.ml | 3 +-
tests/passing/js-sexp.ml | 10 +-
tests/passing/js-syntax.ml | 12 -
tests/passing/js-test.ml | 50 +-
tests/passing/pattern.ml | 2 +-
tools/ocp-indent.el | 8 +-
tools/ocp-indent.vim | 18 +-
uninstall.sh | 118 +++++
53 files changed, 1152 insertions(+), 258 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
