This is an automated email from the git hooks/post-receive script.
lifengsun-guest pushed a commit to branch master
in repository type-conv.
commit c680e0a9da3b2c04e04131705e1a473561bf65ac
Merge: 22d6ce1 c9a3789
Author: Lifeng Sun <lifong...@gmail.com>
Date: Sat Apr 12 21:35:58 2014 +0800
Merge tag 'upstream/109.60.01'
Upstream version 109.60.01
Conflicts:
INSTALL.txt
Makefile
_oasis
_tags
configure
lib/META
lib/pa_type_conv.ml
lib/pa_type_conv.mli
myocamlbuild.ml
setup.ml
INSTALL.txt | 6 +-
Makefile | 2 +-
_oasis | 9 +-
_tags | 10 +-
configure | 4 +-
lib/META | 8 +-
lib/pa_type_conv.ml | 57 +-
lib/pa_type_conv.mli | 21 +-
myocamlbuild.ml | 242 +++++---
setup.ml | 1502 ++++++++++++++++++++++++++++++++++++++++----------
10 files changed, 1455 insertions(+), 406 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-ocaml-maint/packages/type-conv.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
