com php-src: Merge remote-tracking branch 'origin/master' into str_size_and_int64: ext/spl/spl_array.c
| From: | Anatol Belski | Date: | Wed, 26 Mar 2014 07:31:42 +0000 |
| Subject: | com php-src: Merge remote-tracking branch 'origin/master' into str_size_and_int64: ext/spl/spl_array.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-76604@lists.php.net to get a copy of this message | ||
Commit: fd89d420a849e347de14abed7bdca0dac7f9e43f
Author: Anatol Belski <ab@php.net> Wed, 26 Mar 2014 08:31:42 +0100
Parents: 9a9af437cb3d92ce8647593de219757312434e34 5fe735c5a2f13203e11624cf29e8aa027836ae42
Branches: str_size_and_int64
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=fd89d420a849e347de14abed7bdca0dac7f9e43f
Log:
Merge remote-tracking branch 'origin/master' into str_size_and_int64
* origin/master:
fix merge issue
Added TSRMLS_CC to zend_is_true() calls
Conflicts:
ext/spl/spl_array.c
Changed paths:
MM ext/spl/spl_array.c
Diff: