[Pkg-ocaml-maint-commits] [camlp5] 02/03: Merge tag 'upstream/6.13'

[Stéphane Glondu]

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

glondu pushed a commit to branch master
in repository camlp5.

commit 21036beb8eb19d7bce51e5d821c83bcb6622afb7
Merge: 19c75d1 35f7594
Author: Stephane Glondu <steph at glondu.net>
Date:   Tue Jun 16 08:45:09 2015 +0200

    Merge tag 'upstream/6.13'
    
    Upstream version 6.13

 CHANGES                                  |    8 +
 LICENSE                                  |    2 +-
 README                                   |    6 +-
 main/pcaml.ml                            |    2 +-
 meta/pa_r.ml                             |   15 +-
 meta/q_MLast.ml                          |   16 +-
 ocaml_src/lib/versdep/4.02.2.ml          |  661 ++++++++++++
 ocaml_src/main/pcaml.ml                  |    2 +-
 ocaml_src/meta/pa_r.ml                   |   68 +-
 ocaml_src/meta/q_MLast.ml                | 1716 +++++++++++++++---------------
 ocaml_stuff/4.02.2/parsing/.depend       |    4 +
 ocaml_stuff/4.02.2/parsing/.gitignore    |    1 +
 ocaml_stuff/4.02.2/parsing/Makefile      |   19 +
 ocaml_stuff/4.02.2/parsing/asttypes.mli  |   49 +
 ocaml_stuff/4.02.2/parsing/location.mli  |  135 +++
 ocaml_stuff/4.02.2/parsing/longident.mli |   22 +
 ocaml_stuff/4.02.2/parsing/parsetree.mli |  829 +++++++++++++++
 ocaml_stuff/4.02.2/utils/.depend         |    2 +
 ocaml_stuff/4.02.2/utils/.gitignore      |    1 +
 ocaml_stuff/4.02.2/utils/Makefile        |   27 +
 ocaml_stuff/4.02.2/utils/pconfig.ml      |    4 +
 ocaml_stuff/4.02.2/utils/pconfig.mli     |    4 +
 ocaml_stuff/4.02.2/utils/warnings.mli    |   86 ++
 23 files changed, 2755 insertions(+), 924 deletions(-)

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