com php-src: Merge branch 'master' into str_size_and_int 64: Zend/zend_language_scanner.c
| From: | Anatol Belski | Date: | Mon, 23 Dec 2013 22:39:42 +0000 |
| Subject: | com php-src: Merge branch 'master' into str_size_and_int 64: Zend/zend_language_scanner.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-75434@lists.php.net to get a copy of this message | ||
Commit: e540839c8b283a7b445ab6552f37f3b1ca0f2eaa
Author: Anatol Belski <ab@php.net> Mon, 23 Dec 2013 23:39:42 +0100
Parents: 63ea29a2067ce06e20dda861480d91624389f0f3 392f6830a15aa670d7ad4de173175ed4e482ffdb
Branches: str_size_and_int64
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e540839c8b283a7b445ab6552f37f3b1ca0f2eaa
Log:
Merge branch 'master' into str_size_and_int64
Conflicts:
Zend/zend_vm_execute.h
ext/opcache/Optimizer/pass1_5.c
ext/opcache/ZendAccelerator.h
Changed paths:
MM Zend/zend_language_scanner.c
Diff: