Andrey Hristov 3dc9bef819 Merge branch 'PHP-5.5' into PHP-5.6 ...

Conflicts:
	ext/fileinfo/data_file.c
	ext/fileinfo/libmagic/softmagic.c
	ext/fileinfo/magicdata.patch

2014-08-06 16:25:12 +03:00

..

tests

Merge branch 'PHP-5.5' into PHP-5.6

2014-08-06 16:25:12 +03:00

config0.m4

Fix long-standing visual pain point: the misalignment of './configure help' text.

2013-08-06 11:06:09 -07:00

config.w32

…

CREDITS

* implement new output API, fixing some bugs and implementing some feature

2010-05-31 10:29:43 +00:00

package.xml

…

php_zlib.def

…

php_zlib.h

Bump year

2014-01-03 11:08:10 +08:00

zlib_filter.c

Merge branch 'PHP-5.4' into PHP-5.5

2014-08-06 15:27:56 +03:00

zlib_fopen_wrapper.c

Fixes to various stream cast on win64

2014-03-19 06:33:46 +01:00

zlib_win32_howto.txt

…

zlib.c

Bump year

2014-01-03 11:08:10 +08:00

zlib.dsp

revert change #298288: Remove old dsp/dsw/makefile files

2010-04-28 14:41:51 +00:00