[Pkg-ocaml-maint-commits] [ocaml-atd] 04/08: Merge tag 'upstream/1.1.1'

[Stéphane Glondu]

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

glondu pushed a commit to branch master
in repository ocaml-atd.

commit 82a8d12efd907f4fd8445388b048fd20f30da43e
Merge: 2c4a8ca e40ef79
Author: Stephane Glondu <steph at glondu.net>
Date:   Wed Jan 29 14:19:27 2014 +0100

    Merge tag 'upstream/1.1.1'
    
    Upstream version 1.1.1

 .gitignore          | 21 +++++++++++++++++++++
 Changes.txt         | 16 ----------------
 Makefile            | 29 +++++++++++++++++++----------
 README.md           |  4 ++--
 atd_expand.ml       | 50 ++++++++++++++++++++++++++++++++++++++++++++------
 atd_expand.mli      | 13 ++++++++++++-
 atd_parser.mly      |  2 ++
 atd_util.ml         |  6 +++---
 atd_util.mli        | 14 ++++++++++----
 atdcat.ml           |  8 +++++---
 manual/atd-body.mlx |  6 ++++--
 test.atd            |  3 +++
 12 files changed, 125 insertions(+), 47 deletions(-)

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