com php-src: Merge branch 'PHP-5.6' into PHP-7.0: ext/fileinfo/libmagic/funcs.c
| From: | Anatol Belski | Date: | Wed, 30 Mar 2016 23:38:22 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.6' into PHP-7.0: ext/fileinfo/libmagic/funcs.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-91565@lists.php.net to get a copy of this message | ||
Commit: e6bb7eb3aa4b0be66130b8299a21e94eeeec2368
Author: Anatol Belski <ab@php.net> Thu, 31 Mar 2016 01:38:22 +0200
Parents: 9dc6c33740694f2b4562f81222791b4fd26c6d0a a00c2b1bf54fb09015321e3677d89da552938306
Branches: PHP-7.0 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e6bb7eb3aa4b0be66130b8299a21e94eeeec2368
Log:
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
fix borked mainstream patch
5.5.35 now
Changed paths:
MM ext/fileinfo/libmagic/funcs.c
Diff: