Merge branch 'PHP-5.5' into PHP-5.6

This commit is contained in:
Anatol Belski 2014-07-02 11:36:00 +02:00
commit 9e2d08923f

View file

@ -246,7 +246,8 @@ foreach ($text_files as $src => $dest) {
/* general other files */ /* general other files */
$general_files = array( $general_files = array(
"php.gif" => "php.gif", "php.gif" => "php.gif",
"$GLOBALS[build_dir]\\deplister.exe" => "deplister.exe",
); );
foreach ($general_files as $src => $dest) { foreach ($general_files as $src => $dest) {