diff options
author | Anatol Belski <ab@php.net> | 2013-04-27 14:09:55 +0200 |
---|---|---|
committer | Anatol Belski <ab@php.net> | 2013-04-27 14:09:55 +0200 |
commit | ca148c030fd71203ea026263ce99be3ec49f0865 (patch) | |
tree | 7bf92316fc64d3766ff3f557c8fd2e188104cb7d /ext/mysqlnd/mysqlnd_result.c | |
parent | d72307f1ca84b9a4c92ed90b9763b06720774caa (diff) | |
parent | e9b03c412ba44826de2c8150c7a930fe9aa17074 (diff) | |
download | php-git-ca148c030fd71203ea026263ce99be3ec49f0865.tar.gz |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
updated libmagic.patch
Diffstat (limited to 'ext/mysqlnd/mysqlnd_result.c')
0 files changed, 0 insertions, 0 deletions