com php-src: Merge branch 'PHP-5.4' into PHP-5.5: acinclude.m4 ext/json/json.c ext/mysqlnd/mysqlnd_result.c ext/pcre/pcr elib/ChangeLog
ext/spl/php_spl.c win32/build/confut ils.js
| From: | Lior Kaplan | Date: | Sun, 17 Aug 2014 12:48:22 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.4' into PHP-5.5: acinclude.m4 ext/json/json.c ext/mysqlnd/mysqlnd_result.c ext/pcre/pcr elib/ChangeLog ext/spl/php_spl.c win32/build/confut ils.js |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-80564@lists.php.net to get a copy of this message | ||
Commit: be2128c8050fd8d22604acb0e225891551c81c8c
Author: Lior Kaplan <kaplanlior@gmail.com> Sun, 17 Aug 2014 15:48:22 +0300
Parents: 6279246d2c60437c583f9c273075579bf17be654 3f42f2f5d1c8026b6e1d21b91857a08d918c28c8
Branches: PHP-5.5 PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=be2128c8050fd8d22604acb0e225891551c81c8c
Log:
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
typofixes
Changed paths:
MM acinclude.m4
MM ext/json/json.c
MM ext/mysqlnd/mysqlnd_result.c
MM ext/pcre/pcrelib/ChangeLog
MM ext/spl/php_spl.c
MM win32/build/confutils.js
Diff: