]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 141f0ca 9d16255)
Merge branch 'PHP-5.6'
authorStanislav Malyshev <stas@php.net>
Thu, 11 Jun 2015 08:52:39 +0000 (01:52 -0700)
committerStanislav Malyshev <stas@php.net>
Thu, 11 Jun 2015 08:52:39 +0000 (01:52 -0700)
* PHP-5.6:
  fix bad copypaste

1  2 
ext/iconv/config.m4 patch | diff1 | diff2 | blob | history

diff --cc ext/iconv/config.m4
Simple merge
Unnamed repository; edit this file 'description' to name the repository.