[Pkg-ocaml-maint-commits] [camlp5] 02/04: Merge tag 'upstream/6.11'

[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 00f196a8cf2f79ca2cc7da2b2d6be7fd67070bf8
Merge: 5787d46 c708dd3
Author: Stephane Glondu <steph at glondu.net>
Date:   Fri Nov 8 17:09:20 2013 +0100

    Merge tag 'upstream/6.11'
    
    Upstream version 6.11

 CHANGES                               |   12 ++++++++++++
 README                                |    2 +-
 etc/pa_lefteval.ml                    |    4 ++--
 etc/pa_o.ml                           |   14 +++++++-------
 etc/pa_scheme.ml                      |    6 +++---
 etc/pa_schemer.ml                     |    4 ++--
 etc/pa_sml.ml                         |    4 ++--
 etc/pr_depend.ml                      |    4 ++--
 etc/pr_o.ml                           |    6 +++---
 etc/pr_r.ml                           |    6 +++---
 etc/pr_scheme.ml                      |    6 +++---
 lib/plexer.ml                         |   10 ++--------
 main/mLast.mli                        |    3 ++-
 main/pcaml.ml                         |    4 ++--
 meta/pa_r.ml                          |   10 +++++-----
 meta/q_MLast.ml                       |    6 +++---
 ocaml_src/lib/plexer.ml               |   32 +++++++++++++++-----------------
 ocaml_src/main/mLast.mli              |    1 +
 ocaml_src/main/pcaml.ml               |    2 +-
 ocaml_src/meta/pa_r.ml                |    9 +++++----
 ocaml_src/meta/q_MLast.ml             |   32 ++++++++------------------------
 ocaml_stuff/4.01.0/utils/warnings.mli |    1 +
 top/rprint.ml                         |    4 ++--
 23 files changed, 87 insertions(+), 95 deletions(-)

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