[Pkg-ocaml-maint-commits] [menhir] 02/04: Merge tag 'upstream/20140422.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 bc83c1f067ce2cb873c8365e363e0383383a7430
Merge: 06dcd61 d8b2ca8
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Sun Apr 27 14:48:15 2014 +0200

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

 CHANGES                    | 14 ++++++++++++++
 INSTALLATION               |  4 +++-
 Makefile                   |  2 +-
 demos/calc-param/calc.ml   | 40 +++++++++++++++++++++++++++-------------
 demos/calc-param/lexer.mll | 19 +++++++++++++++----
 demos/calc-two/calc.ml     | 42 ++++++++++++++++++++++++++++--------------
 demos/calc-two/lexer.mll   | 19 +++++++++++++++----
 demos/calc/calc.ml         | 40 +++++++++++++++++++++++++++-------------
 demos/calc/lexer.mll       | 19 +++++++++++++++----
 src/META                   |  2 +-
 src/Makefile               |  2 +-
 src/coqBackend.ml          | 12 ++++++------
 src/lexer.mll              |  5 +++--
 src/version.ml             |  2 +-
 14 files changed, 157 insertions(+), 65 deletions(-)

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