com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/standard/string.c
| From: | Anatoliy Belsky | Date: | Tue, 15 Jan 2013 21:39:49 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/standard/string.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-70993@lists.php.net to get a copy of this message | ||
Commit: 18e160411e364ee02eff12e8ab516be9911be393
Author: Anatoliy Belsky <ab@php.net> Tue, 15 Jan 2013 22:39:49 +0100
Parents: dba22c08640b02e68bfea68440246fec1fb7459d 9498cf6194496a1dd6b400e3e9a85ff005dc3dcd
Branches: PHP-5.5 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=18e160411e364ee02eff12e8ab516be9911be393
Log:
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fixed build
NEWS for bug #63893
Conflicts:
NEWS
Bugs:
https://bugs.php.net/63893
Changed paths:
MM ext/standard/string.c
Diff: