]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fa863c9 7943f94)
Merge branch 'PHP-5.5' into PHP-5.6
authorAnatol Belski <ab@php.net>
Fri, 5 Dec 2014 10:08:55 +0000 (11:08 +0100)
committerAnatol Belski <ab@php.net>
Fri, 5 Dec 2014 10:08:55 +0000 (11:08 +0100)
* PHP-5.5:
  Fixed bug #65769 localeconv() broken in TS builds

1  2 
ext/standard/string.c patch | diff1 | diff2 | blob | history

diff --cc ext/standard/string.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.