com php-src: fix merge: ext/fileinfo/libmagic/softmagic.c
| From: | Remi Collet | Date: | Tue, 04 Mar 2014 19:39:00 +0000 |
| Subject: | com php-src: fix merge: ext/fileinfo/libmagic/softmagic.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-76327@lists.php.net to get a copy of this message | ||
Commit: 9a9add6b739da70ba4ed29f089c230566c2be002
Author: Remi Collet <remi@php.net> Tue, 4 Mar 2014 20:39:00 +0100
Parents: 834b719cf5808351904734bab5f97f2e88d8176e 014b95a0a7b638787aaa3d6ed864b6c3eaed3910
Branches: PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=9a9add6b739da70ba4ed29f089c230566c2be002
Log:
fix merge
Changed paths:
MM ext/fileinfo/libmagic/softmagic.c
Diff: