com php-src: Merge branch 'master' into str_size_and_int 64: Zend/Zend.dsp Zend/zend.c Zend/zend.h Z end/zend_compile.c Zend/zend_execute.c Zend/zend_
language_scanner.c Zend/zend_language_scanner.l c onfigure.in ext/standard/php_string.h main/SAPI.c main/fopen_wrappers.c main/main.c main/php.h m
ain/streams/plain_wrapper.c win32/build/config.w3 2

From: Date: Sat, 09 Nov 2013 10:03:04 +0000
Subject: com php-src: Merge branch 'master' into str_size_and_int 64: Zend/Zend.dsp Zend/zend.c Zend/zend.h Z end/zend_compile.c Zend/zend_execute.c Zend/zend_
language_scanner.c Zend/zend_language_scanner.l c onfigure.in ext/standard/php_string.h main/SAPI.c main/fopen_wrappers.c main/main.c main/php.h m
ain/streams/plain_wrapper.c win32/build/config.w3 2
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-73911@lists.php.net to get a copy of this message
Commit: ad675f6ac20dfc310e5c463e700918feb8762350 Author: Anatol Belski <ab@php.net> Sat, 9 Nov 2013 11:03:04 +0100 Parents: 7c5af3884ae51d9d5d15c40054cff7b290ae8f0d 43cb6ba7639aacf08f5e6a46428b12f5df303f6f Branches: str_size_and_int64 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=ad675f6ac20dfc310e5c463e700918feb8762350 Log: Merge branch 'master' into str_size_and_int64 Conflicts: main/php_version.h Changed paths: MM Zend/Zend.dsp MM Zend/zend.c MM Zend/zend.h MM Zend/zend_compile.c MM Zend/zend_execute.c MM Zend/zend_language_scanner.c MM Zend/zend_language_scanner.l MM configure.in MM ext/standard/php_string.h MM main/SAPI.c MM main/fopen_wrappers.c MM main/main.c MM main/php..h MM main/streams/plain_wrapper.c MM win32/build/config.w32 Diff: <Diff exceeded maximum size>

« previous php.cvs (#73911) next »