[Pkg-ocaml-maint-commits] [ocaml-re] 02/06: Merge tag 'upstream/1.2.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-re.

commit b0d0b0ec35152cf8f49f01be720a5b2e3faf9a78
Merge: e9589f8 921f1f5
Author: Stephane Glondu <steph at glondu.net>
Date:   Wed Aug 6 10:19:50 2014 +0200

    Merge tag 'upstream/1.2.2'
    
    Upstream version 1.2.2

 CHANGES              |   17 +
 LICENSE              |   23 +-
 README => README.md  |   49 +-
 TODO.txt             |   50 +-
 _oasis               |    6 +-
 _tags                |    8 +-
 lib/automata.ml      |   21 +-
 lib/automata.mli     |   21 +
 lib/cset.ml          |    7 +-
 lib/cset.mli         |   21 +
 lib/re.ml            |  115 ++-
 lib/re.mldylib       |    6 +
 lib/re.mli           |    8 +-
 lib/re_emacs.ml      |    8 +-
 lib/re_emacs.mldylib |    4 +
 lib/re_emacs.mli     |    7 +-
 lib/re_glob.ml       |   23 +-
 lib/re_glob.mldylib  |    4 +
 lib/re_glob.mli      |   26 +-
 lib/re_pcre.mldylib  |    4 +
 lib/re_perl.ml       |    7 +-
 lib/re_perl.mldylib  |    4 +
 lib/re_perl.mli      |    7 +-
 lib/re_posix.ml      |    7 +-
 lib/re_posix.mldylib |    4 +
 lib/re_posix.mli     |    7 +-
 lib/re_str.ml        |    3 +-
 lib/re_str.mldylib   |    4 +
 lib/re_str.mli       |    3 +-
 lib_test/glob.ml     |   36 +
 myocamlbuild.ml      |  340 ++++++---
 setup.ml             | 1932 +++++++++++++++++++++++++++++++++++++++-----------
 32 files changed, 2137 insertions(+), 645 deletions(-)

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