]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorAnatol Belski <ab@php.net>
Thu, 10 Jul 2014 17:37:36 +0000 (19:37 +0200)
committerAnatol Belski <ab@php.net>
Thu, 10 Jul 2014 17:37:36 +0000 (19:37 +0200)
commite00a4b92a3fa98db093fe7ab1f944a12b3057e30
tree9a22cafaa8acd293bc6a897f2f88c2541c146b0d
parente40ecb937e33bfcc19348ecd20592ac6325778b0
parent71f4b1e4d923e9ed85c0a8a9ef5f73d85293d2df
Merge branch 'PHP-5.6'

* PHP-5.6:
  turn off PGO in phpize mode
  Fixed typo in Makefile.frag
  Fixed typo in Makefile.frag