[Pkg-ocaml-maint-commits] [cppo] 02/05: Merge tag 'upstream/1.4.0'

[Hendrik Tews]

This is an automated email from the git hooks/post-receive script.

hendrik-guest pushed a commit to branch master
in repository cppo.

commit 0023c5f9104cb652ebbd2f0aed9924037322e554
Merge: 92dcc90 46f583e
Author: Hendrik Tews <hendrik at askra.de>
Date:   Thu Jan 19 14:23:03 2017 +0100

    Merge tag 'upstream/1.4.0'
    
    Upstream version 1.4.0

 Makefile                              |  2 +-
 README.md                             |  5 +++--
 ocamlbuild_plugin/ocamlbuild_cppo.ml  | 29 ++++++++++++++---------------
 ocamlbuild_plugin/ocamlbuild_cppo.mli |  7 +++++++
 4 files changed, 25 insertions(+), 18 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/cppo.git