[Pkg-ocaml-maint-commits] [tyxml] 12/19: Merge tag 'upstream/3.5.0'

[Mehdi Dogguy]

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

mehdi pushed a commit to branch master
in repository tyxml.

commit 50eebf1130b472deaf084fb2d78789bd5abacf1d
Merge: 18cd699 6984fda
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Sun Oct 18 11:16:55 2015 +0200

    Merge tag 'upstream/3.5.0'
    
    Upstream version 3.5.0
    
    Conflicts:
    	.gitignore

 .gitignore                |   2 ++
 .merlin                   |   5 ++--
 CHANGES                   |  11 ++++++++
 _oasis                    |  15 ++++++++++-
 _tags                     |   9 ++++++-
 lib/META                  |  21 ++++++++++++----
 lib/html5_f.ml            |  30 +++++++++++-----------
 lib/html5_f.mli           |   6 +++--
 lib/html5_sigs.mli        |  10 +++++---
 lib/html5_types.mli       |   2 ++
 lib/svg_f.ml              |  60 +++++++++++++++++++++++++++++++++++++++++++-
 lib/svg_sigs.mli          |  17 +++++++++++++
 lib/svg_types.mli         |   5 ++--
 myocamlbuild.ml           |   5 ++--
 setup.exe                 | Bin 3510843 -> 0 bytes
 setup.ml                  |  62 ++++++++++++++++++++++++++++++++++++++++++----
 syntax/pa_tyxml.ml        |   2 +-
 tools/autoname.ml         |  21 ++++++++++++++++
 tools/tyxml_name.ml       |  46 ++++++++++++++++++++++++++++++++++
 tools/tyxml_name.mli      |  23 +++++++++++++++++
 tools/tyxml_tools.mldylib |   4 +++
 tools/tyxml_tools.mllib   |   4 +++
 22 files changed, 319 insertions(+), 41 deletions(-)

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