]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1ceacc8 33594b7)
Merge branch 'PHP-5.6'
authorStanislav Malyshev <stas@php.net>
Sun, 10 May 2015 02:00:40 +0000 (19:00 -0700)
committerStanislav Malyshev <stas@php.net>
Sun, 10 May 2015 02:00:40 +0000 (19:00 -0700)
* PHP-5.6:
  Fix #48147 - implement manual handling of  //IGNORE for broken libc

Conflicts:
ext/iconv/iconv.c


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