diff options
| author | Andrey Hristov <andrey@php.net> | 2014-08-06 17:03:39 +0300 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2014-08-06 17:03:39 +0300 |
| commit | 847c65e9672072fd772d08a78d653b6142b6c4f0 (patch) | |
| tree | 8e61f6837c4b1b26447178d3f4b1164eddc2ed9c /ext/mysql/php_mysql.c | |
| parent | e6a6a5d9dcd9d29ef76fb86ca716bd7f1169e6cf (diff) | |
| parent | 637367fc738bdb0fbeb54e4a24701203422e93c1 (diff) | |
| download | php-git-847c65e9672072fd772d08a78d653b6142b6c4f0.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
Conflicts:
NEWS
configure.in
main/php_version.h
Diffstat (limited to 'ext/mysql/php_mysql.c')
0 files changed, 0 insertions, 0 deletions