]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.3' into PHP-5.4
authorAnatoliy Belsky <ab@php.net>
Tue, 27 Nov 2012 15:45:25 +0000 (16:45 +0100)
committerAnatoliy Belsky <ab@php.net>
Tue, 27 Nov 2012 15:45:25 +0000 (16:45 +0100)
commitd88017e992d03dc6909b1a1c120668b90f52ae39
tree9940fc169acf1cf2f1a96569c6ec30d4c8b2dd4d
parente0ad33c24aa874dd31053829414f45a9d95ad46a
parente6b727d3b7eef06d8b7b6a4638a95e7a571d97b5
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fixed bug #63590 Fileinfo delivers ifferent results in TS and NTS under Windows

Conflicts:
NEWS
ext/fileinfo/libmagic.patch
ext/fileinfo/tests/finfo_open_error-win32.phpt
NEWS
ext/fileinfo/libmagic.patch
ext/fileinfo/libmagic/apprentice.c
ext/fileinfo/tests/finfo_open_error.phpt