[Pkg-ocaml-maint-commits] [menhir] 02/07: Merge tag 'upstream/20130911.dfsg'

[Mehdi Dogguy]

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

mehdi pushed a commit to branch master
in repository menhir.

commit a291464428331cb8c1c3cfdd800d27c9eebdef5e
Merge: 2a1b613 f3abd71
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Mon Mar 24 22:03:56 2014 +0100

    Merge tag 'upstream/20130911.dfsg'
    
    Upstream version 20130911.dfsg

 AUTHORS                                          |   1 +
 CHANGES                                          |   8 +
 INSTALLATION                                     |   4 +-
 Makefile                                         |  42 +-
 Makefile.arch                                    |  10 -
 demos/calc/.omakedb                              | Bin 4347 -> 0 bytes
 demos/calc/.omakedb.lock                         |   1 -
 demos/calc/OMakefile.omc                         | Bin 9720 -> 0 bytes
 demos/calc/OMakeroot.omc                         | Bin 9370 -> 0 bytes
 demos/calc/stratified.ml                         | 627 -----------------------
 src/IO.ml                                        |   3 +
 src/META                                         |   2 +-
 src/Makefile                                     | 303 +++--------
 src/_tags                                        |  27 +
 src/codeBackend.ml                               |  51 +-
 src/coqBackend.ml                                |  12 +-
 src/front.ml                                     |   2 +
 src/grammar.ml                                   |   3 +-
 src/grammar.mli                                  |   5 +
 demos/calc/stratified.mli => src/installation.ml |  16 +-
 src/interface.ml                                 |   2 +-
 src/invariant.ml                                 |   2 +-
 src/kmp.ml                                       | 304 -----------
 src/lr1.ml                                       |   2 +-
 demos/calc/stratified.mli => src/menhir.ml       |  14 +-
 src/menhirLib.mlpack                             |  10 +
 src/myocamlbuild.ml                              |  62 +++
 src/patricia.ml                                  |  42 +-
 src/printer.ml                                   |  19 +-
 src/reductionGraphs.ml                           |  48 +-
 src/settings.ml                                  |   7 +
 src/settings.mli                                 |   8 +
 src/tokenType.mli                                |   2 -
 src/version.ml                                   |   2 +-
 src/{parser.mly => yacc-parser.mly}              |   0
 35 files changed, 320 insertions(+), 1321 deletions(-)

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