com php-src: Merge branch 'PHP-5.5' into PHP-5.6: acinclude.m4 ext/json/json.c ext/mysqlnd/mysqlnd_result.c win32/bu ild/confutils.js
| From: | Lior Kaplan | Date: | Sun, 17 Aug 2014 12:51:15 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.5' into PHP-5.6: acinclude.m4 ext/json/json.c ext/mysqlnd/mysqlnd_result.c win32/bu ild/confutils.js | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-80562@lists.php.net to get a copy of this message | ||
Commit: 56d02d564e946a03e397297d5d5ded112eefd928
Author: Lior Kaplan <kaplanlior@gmail.com> Sun, 17 Aug 2014 15:51:15 +0300
Parents: c6d9bf294681486e7d0ae67b099c0f45e88b35ac be2128c8050fd8d22604acb0e225891551c81c8c
Branches: PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=56d02d564e946a03e397297d5d5ded112eefd928
Log:
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
typofixes
Changed paths:
MM acinclude.m4
MM ext/json/json.c
MM ext/mysqlnd/mysqlnd_result.c
MM win32/build/confutils.js
Diff: