This is an automated email from the git hooks/post-receive script.
bengen pushed a commit to branch master
in repository bin-prot.
commit dc2c8306a0e9e72521870ae9a496e19497756148
Merge: 466f5ce 5addd52
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
