diff options
author | Anatol Belski <ab@php.net> | 2014-07-01 10:27:38 +0200 |
---|---|---|
committer | Anatol Belski <ab@php.net> | 2014-07-01 10:27:38 +0200 |
commit | 4965d1c2ce8981fcdb21eb6fef185cfec0bb737f (patch) | |
tree | 825a63d90d80c12b5c54e33551544a28556c0f0f /ext/mysqlnd/mysqlnd.c | |
parent | e5fdb5b3f02fcb61efa5aa7d6e5ccd15838470a2 (diff) | |
parent | af5f997a5d388d22411e84c421bec71064c56b61 (diff) | |
download | php-git-4965d1c2ce8981fcdb21eb6fef185cfec0bb737f.tar.gz |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
updated libmagic.patch
Diffstat (limited to 'ext/mysqlnd/mysqlnd.c')
0 files changed, 0 insertions, 0 deletions