]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorAnatol Belski <ab@php.net>
Tue, 25 Mar 2014 05:46:06 +0000 (06:46 +0100)
committerAnatol Belski <ab@php.net>
Tue, 25 Mar 2014 05:46:06 +0000 (06:46 +0100)
commit655f2973eb14518e65b213c577ffded07e191b04
tree4acf9999aec45631e3653253e2ea64b58970fe57
parent59dcf9879b18aa5ac9ca01db6af9a0cef2f59c82
parent7477f5b387c2a492cc29ddd30a0d3d0b0a6a9952
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix disabling PGO for extensions, rel bug #65715
win32/build/config.w32
win32/build/confutils.js