diff options
| author | Lior Kaplan <kaplanlior@gmail.com> | 2015-11-23 18:56:13 +0200 |
|---|---|---|
| committer | Lior Kaplan <kaplanlior@gmail.com> | 2015-11-23 18:56:13 +0200 |
| commit | 9642710a0985f5cf1bf4e3762236439694f072d9 (patch) | |
| tree | 9c2df0c6133dbe1f4d3e80cc55b34d86f7f1f36a /ext/mysqlnd/mysqlnd_net.c | |
| parent | c1189eccae3c555ac5a8610110bb3edb80998d2c (diff) | |
| parent | 1c72e5b29929360167cdeec93b21bb9b6ef33c57 (diff) | |
| download | php-git-9642710a0985f5cf1bf4e3762236439694f072d9.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fixed bug #61751 (SAPI build problem on AIX: Undefined symbol: php_register_internal_extensions)
Conflicts:
sapi/cgi/config9.m4
sapi/fpm/config.m4
Diffstat (limited to 'ext/mysqlnd/mysqlnd_net.c')
0 files changed, 0 insertions, 0 deletions