diff options
| author | Anatol Belski <ab@php.net> | 2015-01-04 17:06:15 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2015-01-04 17:06:15 +0100 |
| commit | d104f2ea881c0737fe13a20698682d2c8ff86819 (patch) | |
| tree | 437e532945ae0c32478dbd4ddbb76335e0316a49 | |
| parent | 5c0f03275efd335798ca8b76c1ad10d1b5bba9a6 (diff) | |
| parent | 4ed261870f5106b904577e394efa70fc5b689a1c (diff) | |
| download | php-git-d104f2ea881c0737fe13a20698682d2c8ff86819.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
updated libmagic.patch in 5.5
updated libmagic.patch in 5.4
0 files changed, 0 insertions, 0 deletions