[Pkg-ocaml-maint-commits] [ocamlweb] 02/08: Merge tag 'upstream/1.39'

[Ralf Treinen]

This is an automated email from the git hooks/post-receive script.

treinen pushed a commit to branch master
in repository ocamlweb.

commit fa2bec3b41e474db5ba1f7db17ceb35d500b8637
Merge: 89ed060 02924c0
Author: Ralf Treinen <treinen at free.fr>
Date:   Wed May 27 09:04:21 2015 +0200

    Merge tag 'upstream/1.39'
    
    Upstream version 1.39

 CHANGES                                            |  29 +-
 Makefile.in                                        |  18 +-
 configure                                          | 180 ++++++-----
 cross.ml                                           |   2 +-
 cross.mli                                          |   2 +-
 doc/ocamlweb-1.38-man.html                         | 314 ------------------
 doc/ocamlweb-1.39-man.html                         | 334 ++++++++++++++++++++
 ...ocamlweb-1.38-man.tex => ocamlweb-1.39-man.tex} |   0
 doclexer.mli                                       |   2 +-
 doclexer.mll                                       | 351 +++++++++++----------
 main.ml                                            |   2 +-
 ocaml-parser/asttypes.mli                          |   2 +-
 ocaml-parser/clflags.ml                            |   2 +-
 ocaml-parser/lexer.mli                             |   2 +-
 ocaml-parser/lexer.mll                             |   2 +-
 ocaml-parser/linenum.mli                           |   2 +-
 ocaml-parser/linenum.mll                           |   2 +-
 ocaml-parser/location.ml                           |   2 +-
 ocaml-parser/location.mli                          |   2 +-
 ocaml-parser/longident.ml                          |   2 +-
 ocaml-parser/longident.mli                         |   2 +-
 ocaml-parser/misc.ml                               |   2 +-
 ocaml-parser/misc.mli                              |   2 +-
 ocaml-parser/parse.ml                              |   2 +-
 ocaml-parser/parse.mli                             |   2 +-
 ocaml-parser/parser.mly                            |   2 +-
 ocaml-parser/parsetree.mli                         |   2 +-
 ocaml-parser/syntaxerr.ml                          |   2 +-
 ocaml-parser/syntaxerr.mli                         |   2 +-
 ocaml-parser/terminfo.ml                           |   2 +-
 ocaml-parser/terminfo.mli                          |   2 +-
 ocaml-parser/warnings.ml                           |   8 +-
 ocaml-parser/warnings.mli                          |   2 +-
 ocamllex-parser/lex_lexer.mll                      |   2 +-
 ocamllex-parser/lex_parser.mly                     |   2 +-
 ocamllex-parser/lex_syntax.mli                     |   2 +-
 output.ml                                          |   2 +-
 output.mli                                         |   2 +-
 pretty.mli                                         |   2 +-
 pretty.mll                                         |   2 +-
 web.ml                                             |  14 +-
 web.mli                                            |   3 +-
 yacc_lexer.mll                                     |   2 +-
 yacc_parser.mly                                    |   2 +-
 yacc_syntax.ml                                     |   2 +-
 yacc_syntax.mli                                    |   2 +-
 46 files changed, 689 insertions(+), 634 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocamlweb.git