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

[Felix Geyer]

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

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

commit d1ccfc8d185b6234b11ce01a3f778d2fe3776304
Merge: aebb38f 86b6b9a
Author: Felix Geyer <fgeyer at debian.org>
Date:   Tue Aug 13 12:30:19 2013 +0200

    Merge tag 'upstream/2.0.0+dfsg'
    
    Upstream version 2.0.0+dfsg
    
    # gpg: Signature made Di 13 Aug 2013 12:30:18 CEST using RSA key ID 83135D45
    # gpg: Good signature from "Felix Geyer <felix at fobos.de>"
    # gpg:                 aka "Felix Geyer <debfx-pkg at fobos.de>"
    # gpg:                 aka "Felix Geyer <debfx at kubuntu.org>"
    # gpg:                 aka "Felix Geyer <debfx at fobos.de>"
    # gpg:                 aka "Felix Geyer <debfx at ubuntu.com>"
    # gpg:                 aka "Felix Geyer <felix.geyer at fobos.de>"
    # gpg:                 aka "Felix Geyer <fgeyer at debian.org>"

 Android.mk         |   18 +-
 CHANGES.txt        |    5 +
 IMG.c              |   10 +-
 IMG_bmp.c          |   66 +-
 IMG_lbm.c          |    6 +-
 IMG_png.c          |  172 +-
 IMG_tga.c          |    2 +-
 IMG_webp.c         |   14 +-
 IMG_xcf.c          |   26 +-
 Makefile.am        |    6 +-
 Makefile.in        |   10 +-
 README.txt         |    2 +-
 SDL2_image.spec    |    2 +-
 SDL2_image.spec.in |    2 +-
 SDL_image.h        |   11 +-
 acinclude/sdl2.m4  |   36 +-
 configure          |   83 +-
 configure.in       |   33 +-
 gcc-fat.sh         |   28 +-
 miniz.h            | 4771 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 showimage.c        |   40 +-
 21 files changed, 5115 insertions(+), 228 deletions(-)

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