com php-src: Merge remote-tracking branch 'origin/str_size _and_int64_56_backport' into str_size _and_int64: Zend/zend.h Zend/zend_API.c Z
end/zend_API.h Zend/zend_object_handlers.c ext/my sqlnd/mysqlnd_ps.c ext/openssl/openssl.c
| From: | Anatol Belski | Date: | Wed, 19 Feb 2014 23:00:33 +0000 |
| Subject: | com php-src: Merge remote-tracking branch 'origin/str_size _and_int64_56_backport' into str_size _and_int64: Zend/zend.h Zend/zend_API.c Z end/zend_API.h Zend/zend_object_handlers.c ext/my sqlnd/mysqlnd_ps.c ext/openssl/openssl.c |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-76126@lists.php.net to get a copy of this message | ||
Commit: ef295ab8e8ae9470ccecb7ea862da3548a95aad7
Author: Anatol Belski <ab@php.net> Thu, 20 Feb 2014 00:00:33 +0100
Parents: a3dd7ab5935440a88fe33a352faf99b4a8526f02 cd064187da8bfa7915c5f4716ae8d4efe13e25bd
Branches: str_size_and_int64
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=ef295ab8e8ae9470ccecb7ea862da3548a95aad7
Log:
Merge remote-tracking branch 'origin/str_size_and_int64_56_backport' into
str_size_and_int64
Conflicts:
NEWS
Changed paths:
MM Zend/zend.h
MM Zend/zend_API.c
MM Zend/zend_API.h
MM Zend/zend_object_handlers.c
MM ext/mysqlnd/mysqlnd_ps.c
MM ext/openssl/openssl.c
Diff: