[Pkg-ocaml-maint-commits] [cppo] 06/09: Merge tag 'upstream/1.1.2'

[Stéphane Glondu]

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

glondu pushed a commit to branch master
in repository cppo.

commit 45bf01e6f309ba3d39c92eef370deba9a09ea7b8
Merge: 32ea48f 10c7f02
Author: Stephane Glondu <steph at glondu.net>
Date:   Thu Sep 3 14:22:08 2015 +0200

    Merge tag 'upstream/1.1.2'
    
    Upstream version 1.1.2

 .gitignore                           |  18 +
 .ocp-indent                          |  22 ++
 Makefile                             |  17 +-
 README.md                            |  81 +++--
 cppo_command.ml                      |   2 -
 cppo_eval.ml                         | 659 +++++++++++++++++++----------------
 cppo_lexer.mll                       | 500 +++++++++++++-------------
 cppo_main.ml                         | 156 ++++++---
 cppo_parser.mly                      | 131 +++----
 cppo_types.ml                        |  15 +-
 examples/french.ml                   |   4 +-
 examples/lexer.mll                   |   2 +-
 ocamlbuild_plugin/ocamlbuild_cppo.ml |   6 +-
 test.cppo                            |   1 -
 test/Makefile                        |  26 ++
 test/comments.cppo                   |   7 +
 test/comments.ref                    |   8 +
 test/cond.cppo                       |  47 +++
 {testdata => test}/ext.cppo          |   0
 {testdata => test}/ext.ref           |   0
 {testdata => test}/incl.cppo         |   0
 {testdata => test}/incl2.cppo        |   0
 {testdata => test}/source.sh         |   0
 test/tuple.cppo                      |  38 ++
 test/version.cppo                    |  30 ++
 testdata/Makefile                    |   7 -
 26 files changed, 1079 insertions(+), 698 deletions(-)

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