]> git.saurik.com Git - wxWidgets.git/commit
corrected conflicts after import of libpng-1.2.4
authorGilles Depeyrot <gilles_depeyrot@mac.com>
Mon, 8 Jul 2002 23:03:16 +0000 (23:03 +0000)
committerGilles Depeyrot <gilles_depeyrot@mac.com>
Mon, 8 Jul 2002 23:03:16 +0000 (23:03 +0000)
commit4946a942d77cf51e00aa56404756e124d7c11411
treee1349d665dd6dd7fb77f38d1d59b2ce066dbbc86
parent75b6e0a0aba793c6b739689b4414c1a2d8fcb041
corrected conflicts after import of libpng-1.2.4

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16100 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
29 files changed:
src/png/ANNOUNCE
src/png/CHANGES
src/png/INSTALL
src/png/README
src/png/TODO
src/png/Y2KINFO
src/png/example.c
src/png/libpng.3
src/png/libpng.txt
src/png/libpngpf.3
src/png/png.5
src/png/png.c
src/png/png.h
src/png/pngconf.h
src/png/pngerror.c
src/png/pngget.c
src/png/pngmem.c
src/png/pngpread.c
src/png/pngread.c
src/png/pngrio.c
src/png/pngrtran.c
src/png/pngrutil.c
src/png/pngset.c
src/png/pngtest.c
src/png/pngtrans.c
src/png/pngwio.c
src/png/pngwrite.c
src/png/pngwtran.c
src/png/pngwutil.c