[Pkg-ocaml-maint-commits] [hevea] 07/13: Merge tag 'upstream/2.14'

[Ralf Treinen]

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

treinen pushed a commit to branch master
in repository hevea.

commit 67efe90c61837f041c5b730db2db1c8993d7f3d6
Merge: 4c36bb9 e986eff
Author: Ralf Treinen <treinen at free.fr>
Date:   Sat May 3 08:57:00 2014 +0200

    Merge tag 'upstream/2.14'
    
    Upstream version 2.14

 CHANGES       |  2 ++
 buff.ml       | 43 ------------------------------------
 buff.mli      | 18 ---------------
 cross.ml      |  6 ++---
 cutOut.ml     |  3 ++-
 esp.ml        | 11 ++++-----
 esp.mli       |  6 ++---
 esponja.ml    | 19 ++++++++++++++--
 hevea.ml      |  1 +
 htmllex.mli   | 14 +++++++-----
 htmllex.mll   | 71 ++++++++++++++++++++++++++++++++---------------------------
 htmlparse.ml  | 57 +++++++++++++++++++++++++++--------------------
 htmlparse.mli | 11 +++++----
 infoRef.mll   | 18 +++++++--------
 tagout.mll    | 10 +++++----
 version.ml    |  4 ++--
 16 files changed, 135 insertions(+), 159 deletions(-)

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