]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7595176 39612af)
Merge branch 'PHP-5.5'
authorChristopher Jones <sixd@php.net>
Thu, 15 Aug 2013 03:47:00 +0000 (20:47 -0700)
committerChristopher Jones <sixd@php.net>
Thu, 15 Aug 2013 03:47:00 +0000 (20:47 -0700)
commit3c166c47584c7a7eb8c1ce42ea05a8a5677da028
tree7d7e5cf3f27e24c669e6f5272ed4354f2dc0722dtree | snapshot
parent759517651ec5fb09349a3653435dc9ddd0fc53b5commit | diff
parent39612afc72623e89a2bc595c9be4be497568d1becommit | diff
Merge branch 'PHP-5.5'

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

Conflicts:
ext/gmp/gmp.c
ext/gmp/gmp.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/standard/string.c diff1 | diff2 | blob | history
ext/zip/php_zip.c diff1 | diff2 | blob | history
main/rfc1867.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.