diff options
author | Anatol Belski <ab@php.net> | 2014-02-24 10:12:50 +0100 |
---|---|---|
committer | Anatol Belski <ab@php.net> | 2014-02-24 10:12:50 +0100 |
commit | bca0e5edd5b80990b36e611da59ee32b6a0a0161 (patch) | |
tree | deb3c73404680ab2ac2afbc7a949d1b68117bc9d /ext/mysql/php_mysql.c | |
parent | 2198bbce868e8a3423e05c573ab4f69417ef5b88 (diff) | |
parent | c6a4a7cad6ee80176047cbd874788235838f5c8b (diff) | |
download | php-git-bca0e5edd5b80990b36e611da59ee32b6a0a0161.tar.gz |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fixed macro
Diffstat (limited to 'ext/mysql/php_mysql.c')
0 files changed, 0 insertions, 0 deletions