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

glondu pushed a commit to branch master
in repository camlimages.

commit ff9bd1e86d85038072c41a4144f20891d58b509f
Merge: 88f211a 061a3ab
Author: Stephane Glondu <st...@glondu.net>
Date:   Thu Feb 26 16:13:32 2015 +0100

    Merge tag 'upstream/4.2.0'
    
    Upstream version 4.2.0

 .hg_archival.txt                    |    4 +
 .hgignore                           |    4 +
 .hgtags                             |    5 +
 0BUILD.sh                           |    7 -
 Announce                            |   28 -
 Announce-4.0.1.txt                  |   37 -
 Changes.txt                         |   32 +
 INSTALL-old.txt                     |  143 -
 INSTALL.rst                         |   85 +
 INSTALL.txt                         |  150 -
 OMakefile                           |  341 +-
 OMakeroot                           |   38 -
 OMyMakeroot                         |   85 +-
 README => README.md                 |   89 +-
 README.rst                          |  208 +
 configure                           | 9772 -----------------------------------
 configure.ac                        |  557 --
 doc/sphinx/Makefile                 |  110 +
 examples/converter/OMakefile        |    2 +-
 examples/converter/converter.ml     |    3 +-
 examples/crop/OMakefile             |    2 +-
 examples/crop/crop.ml               |    8 +-
 examples/edgedetect/OMakefile       |    2 +-
 examples/gifanim/gifanim.ml         |    3 +-
 examples/gifanim/guienv.ml          |    1 -
 examples/gifanim/usleep.ml          |    2 +-
 examples/imgstat/OMakefile          |    2 +-
 examples/imgstat/imgstat.ml         |    1 -
 examples/liv-furuse/.cvsignore      |    6 -
 examples/liv-furuse/.depend         |   38 -
 examples/liv-furuse/BulletHole.xpm  |  114 -
 examples/liv-furuse/File.xpm        |   71 -
 examples/liv-furuse/FileUnknown.xpm |   56 -
 examples/liv-furuse/FilesLink.xpm   |   87 -
 examples/liv-furuse/Folder.xpm      |  107 -
 examples/liv-furuse/FolderLink.xpm  |  114 -
 examples/liv-furuse/Monalisa.xpm    |  130 -
 examples/liv-furuse/OMakefile       |   42 -
 examples/liv-furuse/README          |   39 -
 examples/liv-furuse/cache.ml        |   79 -
 examples/liv-furuse/cache.mli       |   23 -
 examples/liv-furuse/deficon.ml      |   70 -
 examples/liv-furuse/display.ml      |  456 --
 examples/liv-furuse/edge.ml         |   72 -
 examples/liv-furuse/enhance.ml      |   84 -
 examples/liv-furuse/faceanm.gif     |  Bin 2042 -> 0 bytes
 examples/liv-furuse/gui.ml          |  148 -
 examples/liv-furuse/icon.ml         |  152 -
 examples/liv-furuse/iconcap         |   22 -
 examples/liv-furuse/iconcap.ml      |   53 -
 examples/liv-furuse/jWidget.ml      |  144 -
 examples/liv-furuse/jpf.ml          |   63 -
 examples/liv-furuse/liv             |  Bin 2035484 -> 0 bytes
 examples/liv-furuse/liv-jpf.ml      |  706 ---
 examples/liv-furuse/liv-org.ml      |  706 ---
 examples/liv-furuse/liv.ml          |  969 ----
 examples/liv-furuse/livdemo.jpg     |  Bin 150200 -> 0 bytes
 examples/liv-furuse/livmisc.ml      |   74 -
 examples/liv-furuse/livsh.ml        |  393 --
 examples/liv-furuse/livshtype.ml    |  129 -
 examples/liv-furuse/livshtype.mli   |    7 -
 examples/liv-furuse/mylazy.ml       |   39 -
 examples/liv-furuse/mylazy.mli      |   42 -
 examples/liv-furuse/pathfind.ml     |   61 -
 examples/liv-furuse/scandir.ml      |   55 -
 examples/liv-furuse/seq.ml          |   24 -
 examples/liv-furuse/sound.xpm       |  263 -
 examples/liv-furuse/tout.ml         |   36 -
 examples/liv-furuse/viewer.ml       |   71 -
 examples/liv/OMakefile              |    4 +-
 examples/liv/cache.ml               |    4 +-
 examples/liv/display.ml             |   11 +-
 examples/liv/gui.ml                 |    6 +-
 examples/liv/icon.ml                |    6 +-
 examples/liv/jWidget.ml             |    7 +-
 examples/liv/jpf.ml                 |    2 +-
 examples/liv/liv.ml                 |  253 +-
 examples/liv/livsh.ml               |    9 +-
 examples/liv/livshtype.ml           |    5 +-
 examples/liv/scandir.ml             |    2 +-
 examples/liv/tout.ml                |    4 +-
 examples/liv/viewer.ml              |    2 -
 examples/monochrome/OMakefile       |    2 +-
 examples/monochrome/monochrome.ml   |   25 +-
 examples/normalize/OMakefile        |    2 +-
 examples/normalize/normalize.ml     |   25 +-
 examples/resize/OMakefile           |    2 +-
 examples/resize/resize.ml           |    2 -
 examples/tiffps/tiffps.ml           |   11 +-
 examples/ttfimg/OMakefile           |    2 +-
 examples/ttfimg/ttfimg.ml           |   17 +-
 install-sh                          |  323 --
 ocaml.m4                            |  279 -
 opam/template/descr                 |    5 +
 opam/template/opam                  |   19 +
 src/META.in                         |   40 +-
 src/OMakefile                       |   52 +-
 src/bitmap.ml                       |   14 +-
 src/bitmap.mli                      |   28 +-
 src/bmp.ml                          |  355 +-
 src/bmp.mli                         |   16 +-
 src/camlimages.ml.in                |   29 +-
 src/cmyk32.ml                       |   12 +-
 src/cmyk32.mli                      |   17 +-
 src/colorhist.ml                    |    2 +-
 src/exif.ml                         |  533 ++
 src/exif.mli                        |  252 +
 src/exif_c.c                        |  292 ++
 src/exif_na.c                       |   41 +
 src/exifanalyze.ml                  |  136 +
 src/exifutil.ml                     |   41 +
 src/freetype.ml                     |    2 +-
 src/fttext.ml                       |    6 +-
 src/fttext.mli                      |    1 -
 src/genimage.ml                     |    1 -
 src/gif.ml                          |   23 +-
 src/gifread.c                       |   37 +-
 src/gifwrite.c                      |   53 +-
 src/graphic_image.mli               |    2 -
 src/image_intf.mli                  |   40 +-
 src/imagegdk.ml                     |    2 -
 src/images.mli                      |    8 +-
 src/index16.ml                      |    9 +-
 src/index16.mli                     |   17 +-
 src/index8.ml                       |    7 +-
 src/index8.mli                      |   17 +-
 src/jis_unicode.ml                  |    8 +-
 src/jpeg.ml                         |  105 +-
 src/jpeg.mli                        |   26 +-
 src/jpeg_na.c                       |    1 +
 src/jpegread.c                      |  308 +-
 src/jpegwrite.c                     |  224 +-
 src/mstring.ml                      |   40 +-
 src/oColor.ml                       |    9 -
 src/oGif.ml                         |    1 -
 src/oImages.ml                      |    5 +-
 src/oImages.mli                     |  114 +-
 src/oJpeg.ml                        |    2 -
 src/oPng.ml                         |    2 -
 src/oTiff.ml                        |    2 -
 src/oXimage.ml                      |    3 -
 src/oXimage.mli                     |    2 -
 src/oXpm.ml                         |    2 -
 src/oXvthumb.ml                     |    1 -
 src/png.ml                          |    8 +-
 src/pngread.c                       |   37 +-
 src/pngwrite.c                      |    4 +-
 src/ppm.ml                          |   28 +-
 src/ps.ml                           |    2 +-
 src/rgb24.ml                        |   10 +-
 src/rgb24.mli                       |   19 +-
 src/rgba32.ml                       |   12 +-
 src/rgba32.mli                      |   17 +-
 src/tiff.ml                         |   10 +-
 src/tiff.mli                        |    4 +-
 src/tiffread.c                      |   24 +-
 src/tiffwrite.c                     |   21 +-
 src/{oGif.ml => util.ml}            |   24 +-
 src/util.mli                        |   38 +
 src/ximage.mli                      |    2 -
 src/xpm.ml                          |   19 +-
 src/xpmread.c                       |   21 +-
 src/xvthumb.ml                      |    6 +-
 test/OMakefile                      |   14 +-
 test/jpgexif.ml                     |   46 +
 test/jpgmark.ml                     |   36 +
 test/test.ml                        |   91 +-
 test/test2.ml                       |   81 +
 168 files changed, 3429 insertions(+), 18580 deletions(-)

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

_______________________________________________
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits

Reply via email to