com php-src: Fix merge (5.6 already have file 5.17): ext/fileinfo/data_file.c ext/fileinfo/magicdata.patch
| From: | Remi Collet | Date: | Tue, 25 Mar 2014 10:03:59 +0000 |
| Subject: | com php-src: Fix merge (5.6 already have file 5.17): ext/fileinfo/data_file.c ext/fileinfo/magicdata.patch | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-76595@lists.php.net to get a copy of this message | ||
Commit: 64d7dd55d3ffeed9e4f3b129ed55e33ae5e6a362
Author: Remi Collet <remi@php.net> Tue, 25 Mar 2014 11:03:59 +0100
Parents: 655f2973eb14518e65b213c577ffded07e191b04 8b7b67a21b3b6adfb7df7f2d2df23037a98c04a5
Branches: PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=64d7dd55d3ffeed9e4f3b129ed55e33ae5e6a362
Log:
Fix merge (5.6 already have file 5.17)
Changed paths:
MM ext/fileinfo/data_file.c
AM ext/fileinfo/magicdata.patch
Diff: