]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorAdam Harvey <aharvey@php.net>
Thu, 1 May 2014 18:23:14 +0000 (11:23 -0700)
committerAdam Harvey <aharvey@php.net>
Thu, 1 May 2014 18:23:14 +0000 (11:23 -0700)
* PHP-5.5:
  Use the right path for the suggested PHP invocation in ext_skel.

1  2 
ext/ext_skel

diff --cc ext/ext_skel
Simple merge