[Pkg-ocaml-maint-commits] [utop] 02/03: Merge tag 'upstream/1.19.2'

[Hilko Bengen]

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

bengen pushed a commit to branch master
in repository utop.

commit ec8f1841d22400a82ad470f7b52169a4753db9d5
Merge: 7afc971 f727b1f
Author: Hilko Bengen <bengen at debian.org>
Date:   Mon Apr 25 19:47:33 2016 +0200

    Merge tag 'upstream/1.19.2'
    
    Upstream version 1.19.2

 CHANGES.md                                  |  26 +++
 README.md                                   |  37 +++-
 _oasis                                      |   9 +-
 _tags                                       |   2 +-
 examples/custom-utop/Makefile               |   2 +-
 examples/{custom-utop => interact}/Makefile |   2 +-
 examples/interact/_tags                     |   1 +
 examples/interact/test_program.ml           |  12 ++
 examples/interact/test_program.mli          |   1 +
 man/utoprc.5                                |   7 +
 myocamlbuild.ml                             |  31 +++-
 opam                                        |   1 +
 setup.ml                                    |  22 ++-
 src/lib/META                                |   6 +-
 src/lib/uTop.cppo.ml                        |  20 +-
 src/lib/uTop.mli                            |  15 ++
 src/lib/uTop_complete.cppo.ml               |  32 ++--
 src/lib/uTop_lexer.mll                      |  20 +-
 src/lib/uTop_main.cppo.ml                   | 276 ++++++++++++++++++++--------
 src/lib/uTop_main.mli                       |   9 +
 src/lib/uTop_private.ml                     |  10 +
 src/lib/uTop_styles.ml                      |   3 +
 src/lib/uTop_token.ml                       |   4 +-
 src/lib/utop.mldylib                        |   3 +-
 src/lib/utop.mllib                          |   3 +-
 src/top/utop.el                             |   9 +-
 26 files changed, 440 insertions(+), 123 deletions(-)

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