This is an automated email from the git hooks/post-receive script. josch-guest pushed a commit to branch master in repository ocp-indent.
commit 4cd02f7cbc5e84f0205ebe3dac0d214a54f1c286 Merge: 35522ff 3818059 Author: josch <j.scha...@email.de> Date: Sat Sep 13 10:27:02 2014 +0200 Merge tag 'upstream/1.4.2' Upstream version 1.4.2 Makefile | 11 ++- Makefile.simple | 10 ++- configure | 22 +++--- configure.ac | 4 +- doc/ocp-indent.md | 6 +- ocp-indent.install | 2 +- opam | 17 ++--- src/approx_common.mli | 25 ------- src/approx_lexer.mll | 77 +++++++------------ src/approx_tokens.ml | 31 ++++---- src/indentArgs.ml | 36 +++++++-- src/indentArgs.mli | 6 +- src/indentBlock.ml | 110 +++++++++++++++++++++++++--- src/indentBlock.mli | 5 +- src/indentConfig.ml | 68 ++++++++++++----- src/indentConfig.mli | 10 ++- src/indentExtend.ml | 58 +++++++++++++++ src/indentExtend.mli | 31 ++++++++ src/indentLoader.ml | 60 +++++++++++++++ src/indentLoader.mli | 15 ++++ src/indentMain.ml | 28 ++++--- src/indentPrinter.ml | 5 +- src/indentPrinter.mli | 5 +- src/nstream.ml | 17 +++-- src/nstream.mli | 7 +- src/ocp-indent.ocp | 20 ++++- src/pos.ml | 5 +- src/pos.mli | 5 +- src/util.ml | 5 +- tests/failing-output/js-record.ml | 2 +- tests/failing-output/js-try.ml | 5 ++ tests/failing-output/js-upon.ml | 13 ++++ tests/failing-output/lwt.ml | 24 ++++++ tests/failing.html | 66 ++++++++++++++++- tests/failing/js-try.ml | 5 ++ tests/failing/js-try.ml.opts | 1 + tests/failing/js-upon.ml | 13 ++++ tests/failing/js-upon.ml.opts | 1 + tests/failing/lwt.ml | 24 ++++++ tests/{passing => failing}/lwt.ml.opts | 0 tests/passing/embedded-match.ml | 17 +++++ tests/passing/lwt.ml | 12 --- tests/passing/ppx_expr_ext.ml | 130 +++++++++++++++++++++++++++++++++ tests/passing/ppx_stritem_ext.ml | 96 ++++++++++++++++++++++++ tests/test.sh | 13 ++++ tools/ocp-indent.el | 52 ++++++++++--- tools/ocp-indent.vim | 16 +++- tools/tuareg-indent | 12 +++ 48 files changed, 974 insertions(+), 229 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