diff options
| author | Andrey Hristov <andrey@php.net> | 2013-01-09 19:03:56 +0100 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2013-01-09 19:03:56 +0100 |
| commit | 790096b68b2a58eb691e8a6f33325e8826bec263 (patch) | |
| tree | 4cf4efa6cccdea89c9698090fa9d0015a8adcafe /ext/mysql/php_mysql.c | |
| parent | 1f7f8429af67cd362ed1dc5ee81bcf518e9d44be (diff) | |
| parent | 258c76eb41a7eaf8e1e7b4994fa5f268c2060039 (diff) | |
| download | php-git-790096b68b2a58eb691e8a6f33325e8826bec263.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
Conflicts:
ext/mysqlnd/mysqlnd_enum_n_def.h
Diffstat (limited to 'ext/mysql/php_mysql.c')
0 files changed, 0 insertions, 0 deletions