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

[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 74058c85ed5265bcde9305f6fa46b64111018083
Merge: 00bfe69 76035f5
Author: Stephane Glondu <steph at glondu.net>
Date:   Fri Oct 9 15:37:04 2015 +0200

    Merge tag 'upstream/6.14'
    
    Upstream version 6.14

 CHANGES                                  |   5 +
 README                                   |   4 +-
 main/pcaml.ml                            |   2 +-
 ocaml_src/lib/versdep/4.02.3.ml          | 661 ++++++++++++++++++++++++
 ocaml_src/lib/versdep/4.02.4.ml          | 661 ++++++++++++++++++++++++
 ocaml_src/main/pcaml.ml                  |   2 +-
 ocaml_stuff/4.02.3/parsing/.depend       |   4 +
 ocaml_stuff/4.02.3/parsing/.gitignore    |   1 +
 ocaml_stuff/4.02.3/parsing/Makefile      |  19 +
 ocaml_stuff/4.02.3/parsing/asttypes.mli  |  49 ++
 ocaml_stuff/4.02.3/parsing/location.mli  | 135 +++++
 ocaml_stuff/4.02.3/parsing/longident.mli |  22 +
 ocaml_stuff/4.02.3/parsing/parsetree.mli | 829 +++++++++++++++++++++++++++++++
 ocaml_stuff/4.02.3/utils/.depend         |   2 +
 ocaml_stuff/4.02.3/utils/.gitignore      |   1 +
 ocaml_stuff/4.02.3/utils/Makefile        |  27 +
 ocaml_stuff/4.02.3/utils/pconfig.ml      |   4 +
 ocaml_stuff/4.02.3/utils/pconfig.mli     |   4 +
 ocaml_stuff/4.02.3/utils/warnings.mli    |  86 ++++
 ocaml_stuff/4.02.4/parsing/.depend       |   4 +
 ocaml_stuff/4.02.4/parsing/.gitignore    |   1 +
 ocaml_stuff/4.02.4/parsing/Makefile      |  19 +
 ocaml_stuff/4.02.4/parsing/asttypes.mli  |  49 ++
 ocaml_stuff/4.02.4/parsing/location.mli  | 135 +++++
 ocaml_stuff/4.02.4/parsing/longident.mli |  22 +
 ocaml_stuff/4.02.4/parsing/parsetree.mli | 829 +++++++++++++++++++++++++++++++
 ocaml_stuff/4.02.4/utils/.depend         |   2 +
 ocaml_stuff/4.02.4/utils/.gitignore      |   1 +
 ocaml_stuff/4.02.4/utils/Makefile        |  27 +
 ocaml_stuff/4.02.4/utils/pconfig.ml      |   4 +
 ocaml_stuff/4.02.4/utils/pconfig.mli     |   4 +
 ocaml_stuff/4.02.4/utils/warnings.mli    |  86 ++++
 32 files changed, 3697 insertions(+), 4 deletions(-)

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