com php-src: Merge branch 'PHP-5.5' into PHP-5.6: ext/fileinfo/libmagic/apprentice.c
| From: | Ard Biesheuvel | Date: | Sat, 20 Sep 2014 23:42:12 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.5' into PHP-5.6: ext/fileinfo/libmagic/apprentice.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-81826@lists.php.net to get a copy of this message | ||
Commit: 8312836c7407d2398285432a11db13f2f79570e3
Author: Ard Biesheuvel <ard.biesheuvel@linaro.org> Sat, 20 Sep 2014 16:42:12 -0700
Parents: 308c0a727ec496ff551f67052b0835de3c152c11 7958793342783a67f2ebbb2db1abf01474d3c1f4
Branches: PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=8312836c7407d2398285432a11db13f2f79570e3
Log:
Merge branch 'PHP-5.5' into PHP-5.6
Changed paths:
MM ext/fileinfo/libmagic/apprentice.c
Diff: