]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 17e2192 d88017e)
Merge branch 'PHP-5.4' into PHP-5.5
authorAnatoliy Belsky <ab@php.net>
Tue, 27 Nov 2012 15:55:47 +0000 (16:55 +0100)
committerAnatoliy Belsky <ab@php.net>
Tue, 27 Nov 2012 15:55:47 +0000 (16:55 +0100)
* PHP-5.4:
  Fixed bug #63590 Fileinfo delivers ifferent results in TS and NTS under Windows

Conflicts:
NEWS


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.