]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2c55ae5 f14141a)
Merge branch 'PHP-5.5' into PHP-5.6
authorAnatol Belski <ab@php.net>
Wed, 10 Jun 2015 11:16:29 +0000 (13:16 +0200)
committerAnatol Belski <ab@php.net>
Wed, 10 Jun 2015 11:16:29 +0000 (13:16 +0200)
* PHP-5.5:
  regenerated the ini scanner

1  2 
Zend/zend_ini_scanner.c patch | diff1 | diff2 | blob | history

diff --cc Zend/zend_ini_scanner.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.