[Pkg-sdl-commits] [libsdl2-image] 04/05: Merge tag 'upstream/2.0.1+dfsg'

[Gianfranco Costamagna]

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

locutusofborg pushed a commit to branch master
in repository libsdl2-image.

commit f4cfabf721cdddbee728588c675baacad27d7340
Merge: 7f65df5 74b7e4c
Author: Gianfranco Costamagna <locutusofborg at debian.org>
Date:   Mon Jan 25 10:10:43 2016 +0100

    Merge tag 'upstream/2.0.1+dfsg'
    
    Upstream version 2.0.1+dfsg
    
    # gpg: Signature made lun 25 gen 2016 10:10:40 CET using RSA key ID 4E9F5DD9
    # gpg: Good signature from "Gianfranco Costamagna <locutusofborg at debian.org>"
    # gpg:                 aka "Gianfranco Costamagna <costamagnagianfranco at yahoo.it>"
    # gpg:                 aka "[jpeg image of size 23040]"

 Android.mk       |   16 +-
 CHANGES.txt      |   16 +
 COPYING.txt      |    2 +-
 IMG.c            |   15 +-
 IMG_bmp.c        |  140 +-
 IMG_gif.c        |    2 +-
 IMG_jpg.c        |    2 +-
 IMG_lbm.c        |    6 +-
 IMG_pcx.c        |    4 +-
 IMG_png.c        |   14 +-
 IMG_pnm.c        |    8 +-
 IMG_tga.c        |  239 +-
 IMG_tif.c        |    2 +-
 IMG_webp.c       |   28 +-
 IMG_xcf.c        |    4 +-
 IMG_xpm.c        |  116 +-
 IMG_xv.c         |    4 +-
 IMG_xxx.c        |    4 +-
 SDL2_image.spec  |    2 +-
 SDL_image.h      |    4 +-
 acinclude/pkg.m4 |  157 -
 config.guess     |  301 +-
 config.sub       |  251 +-
 configure        |   12 +-
 configure.in     |   12 +-
 miniz.h          | 9707 +++++++++++++++++++++++++++---------------------------
 showimage.c      |    2 +-
 version.rc       |   10 +-
 28 files changed, 5661 insertions(+), 5419 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-sdl/packages/libsdl2-image.git