diff options
| author | Andrey Hristov <andrey@php.net> | 2014-08-06 17:02:17 +0300 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2014-08-06 17:02:17 +0300 |
| commit | 637367fc738bdb0fbeb54e4a24701203422e93c1 (patch) | |
| tree | 20214821b3fdd497d3eebc1787044e28e37d355e /ext/mysql/php_mysql.c | |
| parent | ce5efa7adc4637957e70a6f6641a38f484baee99 (diff) | |
| parent | 05baed522f4f7cdb5a38e199c7abf5c06bf9b948 (diff) | |
| download | php-git-637367fc738bdb0fbeb54e4a24701203422e93c1.tar.gz | |
Merge branch 'PHP-5.5' of git.php.net:php-src 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