[aseprite] 135/196: Merge branch 'zlib-and-libpng-submodules'

[Tobias Hansen]

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

thansen pushed a commit to branch master
in repository aseprite.

commit 80a649dc12b0cca8163cd0fcedfaef2947001fdf
Merge: 02e9d98 58daa23
Author: David Capello <davidcapello at gmail.com>
Date:   Thu Mar 31 17:57:23 2016 -0300

    Merge branch 'zlib-and-libpng-submodules'
    
    Conflicts:
    	third_party/libpng
    	third_party/zlib

 .gitmodules                          |    6 +
 CMakeLists.txt                       |   23 +-
 third_party/CMakeLists.txt           |   25 +-
 third_party/freetype2                |    2 +-
 third_party/libpng                   |    1 +
 third_party/libpng/CMakeLists.txt    |   26 -
 third_party/libpng/LICENSE           |  111 -
 third_party/libpng/README            |  202 --
 third_party/libpng/TODO              |   27 -
 third_party/libpng/Y2KINFO           |   55 -
 third_party/libpng/example.c         |  862 ------
 third_party/libpng/libpng-manual.txt | 4628 -------------------------------
 third_party/libpng/png.c             | 2870 -------------------
 third_party/libpng/png.h             | 2658 ------------------
 third_party/libpng/pngconf.h         |  596 ----
 third_party/libpng/pngdebug.h        |  157 --
 third_party/libpng/pngerror.c        |  685 -----
 third_party/libpng/pngget.c          | 1124 --------
 third_party/libpng/pnginfo.h         |  269 --
 third_party/libpng/pnglibconf.h      |  189 --
 third_party/libpng/pngmem.c          |  667 -----
 third_party/libpng/pngpread.c        | 1843 -------------
 third_party/libpng/pngpriv.h         | 1629 -----------
 third_party/libpng/pngread.c         | 1308 ---------
 third_party/libpng/pngrio.c          |  176 --
 third_party/libpng/pngrtran.c        | 5023 ----------------------------------
 third_party/libpng/pngrutil.c        | 4158 ----------------------------
 third_party/libpng/pngset.c          | 1284 ---------
 third_party/libpng/pngstruct.h       |  358 ---
 third_party/libpng/pngtest.c         | 1820 ------------
 third_party/libpng/pngtrans.c        |  678 -----
 third_party/libpng/pngwio.c          |  254 --
 third_party/libpng/pngwrite.c        | 1655 -----------
 third_party/libpng/pngwtran.c        |  633 -----
 third_party/libpng/pngwutil.c        | 3180 ---------------------
 third_party/zlib                     |    1 +
 third_party/zlib/CMakeLists.txt      |   87 -
 third_party/zlib/README              |  115 -
 third_party/zlib/adler32.c           |  169 --
 third_party/zlib/algorithm.txt       |  209 --
 third_party/zlib/compress.c          |   80 -
 third_party/zlib/crc32.c             |  442 ---
 third_party/zlib/crc32.h             |  441 ---
 third_party/zlib/deflate.c           | 1834 -------------
 third_party/zlib/deflate.h           |  342 ---
 third_party/zlib/example.c           |  565 ----
 third_party/zlib/gzclose.c           |   25 -
 third_party/zlib/gzguts.h            |  132 -
 third_party/zlib/gzlib.c             |  537 ----
 third_party/zlib/gzread.c            |  653 -----
 third_party/zlib/gzwrite.c           |  531 ----
 third_party/zlib/infback.c           |  632 -----
 third_party/zlib/inffast.c           |  340 ---
 third_party/zlib/inffast.h           |   11 -
 third_party/zlib/inffixed.h          |   94 -
 third_party/zlib/inflate.c           | 1480 ----------
 third_party/zlib/inflate.h           |  122 -
 third_party/zlib/inftrees.c          |  330 ---
 third_party/zlib/inftrees.h          |   62 -
 third_party/zlib/minigzip.c          |  440 ---
 third_party/zlib/trees.c             | 1244 ---------
 third_party/zlib/trees.h             |  127 -
 third_party/zlib/uncompr.c           |   59 -
 third_party/zlib/zconf.h.cmakein     |  430 ---
 third_party/zlib/zlib.h              | 1613 -----------
 third_party/zlib/zutil.c             |  318 ---
 third_party/zlib/zutil.h             |  274 --
 67 files changed, 46 insertions(+), 52875 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/aseprite.git