This is an automated email from the git hooks/post-receive script. lifengsun-guest pushed a commit to branch master in repository fieldslib.
commit 06714e4bc9674d3361b2086e115a7b6f90e17139 Merge: 7ee3879 97cf529 Author: Lifeng Sun <lifong...@gmail.com> Date: Fri Jan 10 22:33:17 2014 +0800 Merge tag 'upstream/109.20.02' Upstream version 109.20.02 Conflicts: INSTALL.txt _oasis lib/META myocamlbuild.ml setup.ml INSTALL.txt | 4 +- _oasis | 2 +- _tags | 12 +- configure | 4 +- lib/META | 10 +- lib/fieldslib.mllib | 4 + myocamlbuild.ml | 242 ++++++--- setup.ml | 1490 ++++++++++++++++++++++++++++++++++++++++++--------- 8 files changed, 1411 insertions(+), 357 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/fieldslib.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