This is an automated email from the git hooks/post-receive script. lifengsun-guest pushed a commit to branch master in repository bin-prot.
commit 129a72692be7c9d57867ac134cdcc8a425116084 Merge: 466f5ce 8f729d5 Author: Lifeng Sun <lifong...@gmail.com> Date: Sat Apr 12 21:31:49 2014 +0800 Merge tag 'upstream/111.03.00' Upstream version 111.03.00 Conflicts: INSTALL.txt Makefile _oasis lib/META lib/blit_stubs.c setup.ml INSTALL.txt | 6 ++--- Makefile | 2 +- _oasis | 9 +------- lib/META | 6 ++--- lib/bin_prot.odocl | 12 ---------- lib/blit_stubs.c | 4 ++-- setup.ml | 65 +++++++++++++++++------------------------------------- 7 files changed, 30 insertions(+), 74 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/bin-prot.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