[Pkg-ocaml-maint-commits] [mysql-ocaml] 03/10: 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 mysql-ocaml.

commit b23650913fdcb313d2d545c0f929163d89606f52
Merge: 4e9fde5 4f3267e
Author: Stephane Glondu <steph at glondu.net>
Date:   Mon May 4 08:20:13 2015 -0300

    Merge tag 'upstream/1.2.0'
    
    Upstream version 1.2.0

 .gitignore         |    3 +
 CHANGES            |    8 +
 Makefile.in        |    4 +-
 Makefile.msvc      |    4 +-
 VERSION            |    6 -
 VERSION.in         |    1 +
 config.h.in        |   58 +
 configure          | 2235 ++++++++++++++++++++++------
 configure.in       |   74 +-
 etc/get_version.ml |   11 +-
 etc/shtool         | 4083 ----------------------------------------------------
 etc/shtool.1       |  269 ----
 mysql.ml           |   29 +-
 mysql.mli          |    1 +
 mysql_stubs.c      |   21 +-
 15 files changed, 1912 insertions(+), 4895 deletions(-)

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