com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/mysqlnd/m ysqlnd_ps.c ext/standard/info.c ext/zlib/zlib_filte r.c
| From: | Andrey Hristov | Date: | Wed, 06 Aug 2014 12:27:56 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/mysqlnd/m ysqlnd_ps.c ext/standard/info.c ext/zlib/zlib_filte r.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-79762@lists.php.net to get a copy of this message | ||
Commit: 41e1ccefd560a3472ba9230b226f14276bdde58d
Author: Andrey Hristov <andrey@php.net> Wed, 6 Aug 2014 15:27:56 +0300
Parents: 95febf26c67b7ccb8703dc8b005658ebd851cb89 9444bc79973f4eb5c76adf2b46b7802205d900bf
Branches: PHP-5.5 PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=41e1ccefd560a3472ba9230b226f14276bdde58d
Log:
Merge branch 'PHP-5.4' into PHP-5.5
Conflicts:
NEWS
configure.in
main/php_version.h
Changed paths:
MM ext/mysqlnd/mysqlnd_ps.c
MM ext/standard/info.c
MM ext/zlib/zlib_filter.c
Diff: