diff options
| author | Andrey Hristov <andrey@php.net> | 2014-08-06 15:27:56 +0300 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2014-08-06 15:27:56 +0300 |
| commit | 41e1ccefd560a3472ba9230b226f14276bdde58d (patch) | |
| tree | f3a34822186fce5bfdb907734885d49aa97bb05d /ext/mysql/php_mysql.c | |
| parent | 95febf26c67b7ccb8703dc8b005658ebd851cb89 (diff) | |
| parent | 9444bc79973f4eb5c76adf2b46b7802205d900bf (diff) | |
| download | php-git-41e1ccefd560a3472ba9230b226f14276bdde58d.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
Conflicts:
NEWS
configure.in
main/php_version.h
Diffstat (limited to 'ext/mysql/php_mysql.c')
0 files changed, 0 insertions, 0 deletions