com php-src: Merge branch 'str_size_and_int64' of https://github.com/weltling/php-src into str_siz e_and_int64: Zend/zend_exceptions.c Zend/zend
_exceptions.h Zend/zend_language_scanner.c Zend/z end_vm_def.h Zend/zend_vm_execute.h ext/date/ph p_date.c ext/oci8/oci8_interface.c ext/oci8/o
ci8_statement.c ext/standard/string.c

From: Date: Wed, 16 Oct 2013 13:02:27 +0000
Subject: com php-src: Merge branch 'str_size_and_int64' of https://github.com/weltling/php-src into str_siz e_and_int64: Zend/zend_exceptions.c Zend/zend
_exceptions.h Zend/zend_language_scanner.c Zend/z end_vm_def.h Zend/zend_vm_execute.h ext/date/ph p_date.c ext/oci8/oci8_interface.c ext/oci8/o
ci8_statement.c ext/standard/string.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-73442@lists.php.net to get a copy of this message
Commit: 4b6d78496253f5bae7bbcf221d8fb2c1342bdafd Author: Anatol Belski <ab@php.net> Wed, 16 Oct 2013 06:02:27 -0700 Parents: 4e537ca4ca34721ea5b5dc916ad009554e4b3740 59ebbf51095b1d689c532334cd6b8d0810beed8e Branches: str_size_and_int64 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=4b6d78496253f5bae7bbcf221d8fb2c1342bdafd Log: Merge branch 'str_size_and_int64' of https://github.com/weltling/php-src into str_size_and_int64 Conflicts: NEWS UPGRADING UPGRADING.INTERNALS Zend/zend_API.c Zend/zend_compile.c Zend/zend_compile.h Zend/zend_constants.h Zend/zend_exceptions.c Zend/zend_exceptions.h Zend/zend_execute.c Zend/zend_language_scanner.c Zend/zend_language_scanner.l Zend/zend_operators.c Zend/zend_vm_def.h Zend/zend_vm_execute.h ext/date/lib/parse_date.c ext/date/php_date.c ext/imap/config.m4 ext/oci8/config.m4 ext/oci8/oci8.c ext/oci8/oci8_dtrace.d ext/oci8/oci8_interface.c ext/oci8/oci8_lob.c ext/oci8/oci8_statement.c ext/oci8/package.xml ext/oci8/php_oci8.h ext/reflection/php_reflection.c ext/spl/spl_directory.c ext/spl/spl_fixedarray.c ext/standard/file.c ext/standard/http_fopen_wrapper.c ext/standard/info.c ext/standard/string.c main/php_variables.c main/streams/streams.c Changed paths: MM Zend/zend_exceptions.c MM Zend/zend_exceptions.h MM Zend/zend_language_scanner.c MM Zend/zend_vm_def.h MM Zend/zend_vm_execute.h MM ext/date/php_date.c MM ext/oci8/oci8_interface.c MM ext/oci8/oci8_statement.c MM ext/standard/string.c Diff: <Diff exceeded maximum size>

« previous php.cvs (#73442) next »