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