diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2017-08-07 13:53:05 -0700 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-08-08 11:48:10 +0200 |
| commit | 883dfb3d156431eeb3ffc8f02a09c89bb7fa7d46 (patch) | |
| tree | d4c2b3d096e1d5c64be698b5d0cd8c8bae35b2b4 /src/3rdparty/zlib/INDEX | |
| parent | 5a9b1425e187bc77122354cf7446bcf6bb322ff4 (diff) | |
| parent | b75bc0f75c09b192dba68449b009cdf175519dbd (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/widgets/kernel/qwidget.cpp
This merge also extends the expected output of the pairdiagnostics
teamcity output (added in dev in commit
c608ffc56ab37f9a9d5b9c34543126adb89e2b08) after the recent addition of
the flowId attribute to the teamcity output (commit
8f036562119dd35ce51dc9230304d893b906bd37 in 5.9).
Change-Id: I3868166e5efc45538544fffd14d8aba438f9173c
Diffstat (limited to 'src/3rdparty/zlib/INDEX')
| -rw-r--r-- | src/3rdparty/zlib/INDEX | 65 |
1 files changed, 0 insertions, 65 deletions
diff --git a/src/3rdparty/zlib/INDEX b/src/3rdparty/zlib/INDEX deleted file mode 100644 index f6c51ca175..0000000000 --- a/src/3rdparty/zlib/INDEX +++ /dev/null @@ -1,65 +0,0 @@ -CMakeLists.txt cmake build file -ChangeLog history of changes -FAQ Frequently Asked Questions about zlib -INDEX this file -Makefile dummy Makefile that tells you to ./configure -Makefile.in template for Unix Makefile -README guess what -configure configure script for Unix -make_vms.com makefile for VMS -treebuild.xml XML description of source file dependencies -zconf.h.cmakein zconf.h template for cmake -zconf.h.in zconf.h template for configure -zlib.3 Man page for zlib -zlib.3.pdf Man page in PDF format -zlib.map Linux symbol information -zlib.pc.in Template for pkg-config descriptor -zlib2ansi perl script to convert source files for C++ compilation - -amiga/ makefiles for Amiga SAS C -doc/ documentation for formats and algorithms -msdos/ makefiles for MSDOS -nintendods/ makefile for Nintendo DS -old/ makefiles for various architectures and zlib documentation - files that have not yet been updated for zlib 1.2.x -qnx/ makefiles for QNX -watcom/ makefiles for OpenWatcom -win32/ makefiles for Windows - - zlib public header files (required for library use): -zconf.h -zlib.h - - private source files used to build the zlib library: -adler32.c -compress.c -crc32.c -crc32.h -deflate.c -deflate.h -gzclose.c -gzguts.h -gzlib.c -gzread.c -gzwrite.c -infback.c -inffast.c -inffast.h -inffixed.h -inflate.c -inflate.h -inftrees.c -inftrees.h -trees.c -trees.h -uncompr.c -zutil.c -zutil.h - - source files for sample programs: -example.c -minigzip.c -See examples/README.examples for more - - unsupported contribution by third parties -See contrib/README.contrib |