[Pkg-ocaml-maint-commits] [ppx-deriving] 02/05: Merge tag 'upstream/4.0'

[Stéphane Glondu]

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

glondu pushed a commit to branch master
in repository ppx-deriving.

commit 9ffe2002ba21a2618c024acee4fc89c07a6c0326
Merge: 05bef42 f617800
Author: Stephane Glondu <steph at glondu.net>
Date:   Fri Aug 5 08:27:33 2016 +0200

    Merge tag 'upstream/4.0'
    
    Upstream version 4.0

 .merlin                                 |   2 +-
 CHANGELOG.md                            |  11 +++
 LICENSE.txt                             |   2 +-
 README.md                               |   8 +-
 _tags                                   |   5 +-
 opam                                    |   7 +-
 pkg/META.in                             |  23 +++---
 src/ppx_deriving.cppo.ml                | 129 ++++++++++++++++++++++++--------
 src/ppx_deriving.mli                    |  75 +++++++++++++------
 src/ppx_deriving_main.cppo.ml           |  24 +++++-
 src/ppx_deriving_runtime.ml             |   1 +
 src/ppx_deriving_runtime.mli            |   5 ++
 src_plugins/ppx_deriving_create.cppo.ml |   2 +
 src_plugins/ppx_deriving_eq.cppo.ml     |  13 +++-
 src_plugins/ppx_deriving_fold.cppo.ml   |   8 +-
 src_plugins/ppx_deriving_iter.cppo.ml   |   6 ++
 src_plugins/ppx_deriving_make.cppo.ml   |   4 +-
 src_plugins/ppx_deriving_map.cppo.ml    |   6 ++
 src_plugins/ppx_deriving_ord.cppo.ml    |   8 ++
 src_plugins/ppx_deriving_show.cppo.ml   |  65 +++++++++++-----
 src_test/test_deriving_eq.cppo.ml       |  23 +++++-
 src_test/test_deriving_fold.cppo.ml     |  20 ++++-
 src_test/test_deriving_iter.cppo.ml     |  35 +++++++--
 src_test/test_deriving_map.cppo.ml      |   9 +++
 src_test/test_deriving_ord.cppo.ml      |  23 +++++-
 src_test/test_deriving_show.cppo.ml     |  22 +++++-
 26 files changed, 417 insertions(+), 119 deletions(-)

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