]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8c61758 9ad97cd)
Merge branch 'PHP-5.4' into PHP-5.5
authorChristopher Jones <sixd@php.net>
Thu, 15 Aug 2013 03:43:25 +0000 (20:43 -0700)
committerChristopher Jones <sixd@php.net>
Thu, 15 Aug 2013 03:43:25 +0000 (20:43 -0700)
commit39612afc72623e89a2bc595c9be4be497568d1be
treeba336742c4b5ad3d4c8933748b91332f7436aa66tree | snapshot
parent8c61758dc772345636e436e3f69bef7323f8b339commit | diff
parent9ad97cd48903ea5454853960f2c14de326e0f624commit | diff
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Reduce (some) compile noise of 'unused variable' and 'may be used uninitialized' warnings.

Conflicts:
ext/dba/libinifile/inifile.c
15 files changed:
ext/date/php_date.c diff1 | diff2 | blob | history
ext/intl/resourcebundle/resourcebundle_class.c diff1 | diff2 | blob | history
ext/openssl/openssl.c diff1 | diff2 | blob | history
ext/openssl/xp_ssl.c diff1 | diff2 | blob | history
ext/session/session.c diff1 | diff2 | blob | history
ext/simplexml/simplexml.c diff1 | diff2 | blob | history
ext/snmp/snmp.c diff1 | diff2 | blob | history
ext/spl/spl_array.c diff1 | diff2 | blob | history
ext/spl/spl_dllist.c diff1 | diff2 | blob | history
ext/standard/array.c diff1 | diff2 | blob | history
ext/standard/string.c diff1 | diff2 | blob | history
ext/zip/php_zip.c diff1 | diff2 | blob | history
main/php_variables.c diff1 | diff2 | blob | history
main/rfc1867.c diff1 | diff2 | blob | history
sapi/cli/php_cli_server.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.