diff options
| author | Anatol Belski <ab@php.net> | 2014-05-27 22:38:02 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-05-27 22:38:02 +0200 |
| commit | 546797f3296b5fddda13c5756feadcaed72b37d0 (patch) | |
| tree | 5f1d3759e6d6f697e60a975028bca81676fb7a56 /sapi/phpdbg/phpdbg.h | |
| parent | a2f8c9c1ae7c3cee168a55c75cf5014ac00a50e5 (diff) | |
| parent | d2765e4b8ca83ca0fbac6a8d1c3b8e52209010a1 (diff) | |
| download | php-git-546797f3296b5fddda13c5756feadcaed72b37d0.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
updated libmagic.patch for 5.4+
Conflicts:
ext/fileinfo/libmagic.patch
Diffstat (limited to 'sapi/phpdbg/phpdbg.h')
0 files changed, 0 insertions, 0 deletions