[Pkg-ocaml-maint-commits] [ocaml-config-file] 02/05: Merge tag 'upstream/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 ocaml-config-file.

commit ed2d5bfcdc5e4c9dc307701d5ca05f7d9c128ef0
Merge: dbbc5f9 a2c27b4
Author: Stephane Glondu <steph at glondu.net>
Date:   Thu Aug 14 15:47:16 2014 +0200

    Merge tag 'upstream/1.2'
    
    Upstream version 1.2

 ChangeLog       |  12 ++++
 META            |   4 +-
 Makefile        |   8 ++-
 config_file.ml  |  49 ++++++++++------
 config_file.mli |  10 ++++
 configure       | 176 +++++++++++++++++++++++++++++---------------------------
 configure.in    |   4 +-
 7 files changed, 157 insertions(+), 106 deletions(-)

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