This is an automated email from the git hooks/post-receive script. gildor pushed a commit to branch master in repository ocaml-expect.
commit e09624a0e95662b11fa1a0de1f328bed5c8503a7 Merge: d3cfd8c 3d4c2ed Author: Sylvain Le Gall <gil...@debian.org> Date: Wed Mar 5 23:50:31 2014 +0000 Merge tag 'upstream/0.0.5' Upstream version 0.0.5 Conflicts: CHANGES.txt INSTALL.txt _oasis _tags myocamlbuild.ml setup.ml src/META src/expect.ml test/test.ml CHANGES.txt | 12 + INSTALL.txt | 4 +- Makefile | 8 +- _oasis | 2 +- _tags | 6 +- configure | 4 +- myocamlbuild.ml | 238 ++++++---- setup.ml | 1398 ++++++++++++++++++++++++++++++++++++++++++------------- src/META | 8 +- src/expect.ml | 242 +++++----- test/qa.ml | 1 + test/test.ml | 26 ++ 12 files changed, 1390 insertions(+), 559 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocaml-expect.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