[Pkg-ocaml-maint-commits] [easy-format] 05/08: Merge tag 'upstream/1.2.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 easy-format.

commit 9559aa885d405695800e70225d3982edc3392d46
Merge: 11d5496 3471338
Author: Stephane Glondu <steph at glondu.net>
Date:   Tue Jan 26 16:06:46 2016 +0100

    Merge tag 'upstream/1.2.0'
    
    Upstream version 1.2.0

 .gitignore          |  23 +++
 .ocp-indent         |  22 +++
 Changes             |   6 +-
 Makefile            |  29 ++--
 TODO                |   3 -
 easy_format.ml      | 450 ++++++++++++++++++++++++++++++++--------------------
 easy_format.mli     |  93 +++++++----
 examples/jsonpp.ml  |  20 ++-
 lambda_example.ml   |  25 ++-
 simple_example.ml   | 141 +++++++++++++---
 test_easy_format.ml |  32 ++--
 11 files changed, 556 insertions(+), 288 deletions(-)

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