]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ac538e5 503d39d)
Merge branch 'PHP-5.4' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Sun, 11 Aug 2013 00:31:48 +0000 (17:31 -0700)
committerStanislav Malyshev <stas@php.net>
Sun, 11 Aug 2013 00:31:48 +0000 (17:31 -0700)
* PHP-5.4:
  php.ini-development/production: remove php_zip.dll
  Update NEWS

1  2 
php.ini-development patch | diff1 | diff2 | blob | history
php.ini-production patch | diff1 | diff2 | blob | history

diff --cc php.ini-development
Simple merge
diff --cc php.ini-production
Simple merge
Unnamed repository; edit this file 'description' to name the repository.