This is an automated email from the git hooks/post-receive script.
mehdi pushed a commit to branch master
in repository tyxml.
commit 765aa0aeca23b7da3f0f2cd243e9d0ca06d8514d
Merge: ad9d71e b995f67
Author: Mehdi Dogguy <me...@debian.org>
Date: Sun Oct 18 11:15:28 2015 +0200
Merge tag 'upstream/3.1.1'
Upstream version 3.1.1
Conflicts:
.gitignore
.gitignore | 12 +-
.merlin | 6 +
.ocp-indent | 1 +
CHANGES | 10 +
Makefile | 77 +++----
_oasis | 18 +-
_tags | 9 +-
configure | 7 +-
apiref-intro => doc/indexdoc | 0
doc/manual-wiki/functors.wiki | 17 +-
{manual => doc/manual-wiki}/intro.wiki | 0
{manual => doc/manual-wiki}/menu.wiki | 0
format.sh | 6 -
lib/META | 10 +-
lib/Makefile | 101 ---------
lib/html5.ml | 2 +-
lib/html5.mli | 22 +-
lib/html5_f.ml | 125 +++++------
lib/html5_f.mli | 38 ++--
lib/html5_sigs.mli | 202 +++++++++---------
lib/html5_types.mli | 111 +++++-----
lib/svg.ml | 2 +-
lib/svg.mli | 18 +-
lib/svg_f.ml | 36 ++--
lib/svg_f.mli | 34 +--
lib/svg_sigs.mli | 70 +++---
lib/svg_types.mli | 20 +-
lib/xhtml.ml | 2 +-
lib/xhtml.mli | 38 ++--
lib/xhtml_f.ml | 336 ++++++++++++++---------------
lib/xhtml_f.mli | 2 +-
lib/xhtml_sigs.mli | 8 +-
lib/xhtml_types.mli | 226 ++++++++++----------
lib/xml.ml | 50 ++---
lib/xml.mli | 16 +-
lib/xml_iter.ml | 146 ++++++-------
lib/xml_iter.mli | 16 +-
lib/xml_print.ml | 143 ++++++++-----
lib/xml_print.mli | 45 ++--
lib/xml_sigs.mli | 2 +-
lib/xml_wrap.ml | 2 +-
lib/xml_wrap.mli | 2 +-
myocamlbuild.ml | 191 ++++++++++-------
opam/descr | 2 -
opam/opam | 12 --
opam/url | 1 -
setup.ml | 376 ++++++++++++++++++++++-----------
syntax/Makefile | 71 -------
syntax/{xhtmlsyntax.ml => pa_tyxml.ml} | 115 +++++-----
syntax/pa_tyxml.mldylib | 6 +-
syntax/pa_tyxml.mllib | 6 +-
syntax/pa_tyxml.mlpack | 8 -
tyxml-api.odocl | 8 +-
53 files changed, 1376 insertions(+), 1408 deletions(-)
diff --cc .gitignore
index 845ca06,18a2841..2f8ad47
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,11 +1,11 @@@
- .pc
+ _build
+ **/*.mlpack
+ **/*.mllib
+ **/*.odocl
+ **/*.docdir
+ lib/META
+ setup.data
+ setup.log
+ **/*~
+ setup.exe
-setup-dev.exe
++setup-dev.exe
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-ocaml-maint/packages/tyxml.git
_______________________________________________
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
