]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorStanislav Malyshev <stas@php.net>
Mon, 5 Jan 2015 04:55:25 +0000 (20:55 -0800)
committerStanislav Malyshev <stas@php.net>
Mon, 5 Jan 2015 04:55:25 +0000 (20:55 -0800)
* PHP-5.6:
  Fixes #66764 -  configure doesn't define EXPANDED_DATADIR / PHP_DATADIR correctly

1  2 
configure.in

diff --cc configure.in
Simple merge