[Pkg-ocaml-maint-commits] [zed] 02/07: Merge tag 'upstream/1.4'

[Hilko Bengen]

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

bengen pushed a commit to branch master
in repository zed.

commit 11df2ff824b65475f96437ab43db3a0b523b6fb4
Merge: ffdd812 35c3744
Author: Hilko Bengen <bengen at hilluzination.de>
Date:   Tue Jan 5 20:13:20 2016 +0100

    Merge tag 'upstream/1.4'
    
    Upstream version 1.4

 .gitignore         |    6 +
 .project           |    1 -
 CHANGES            |   18 -
 CHANGES.darcs      |  169 ---
 CHANGES.md         |   35 +
 Makefile           |   71 +-
 README.md          |   61 +
 _oasis             |   16 +-
 _tags              |   12 +-
 configure          |    4 +-
 myocamlbuild.ml    |  514 +++++----
 setup.ml           | 3229 +++++++++++++++++++++++++++++++++++-----------------
 src/META           |    6 +-
 src/zed.mldylib    |   11 +
 src/zed_cursor.ml  |   84 +-
 src/zed_cursor.mli |    8 +
 src/zed_edit.ml    |    9 +-
 src/zed_edit.mli   |    4 +
 src/zed_lines.ml   |    9 +
 src/zed_lines.mli  |    8 +
 src/zed_rope.ml    |   12 +-
 src/zed_utf8.ml    |   26 +-
 22 files changed, 2779 insertions(+), 1534 deletions(-)

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