granicus.if.org Git - php/commit

]> granicus.if.org Git - php/commit

projects / php / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 9d060e8 152898f)

author	Bob Weinand <bobwei9@hotmail.com>
	Thu, 28 Nov 2013 12:41:42 +0000 (13:41 +0100)
committer	Bob Weinand <bobwei9@hotmail.com>
	Thu, 28 Nov 2013 12:41:42 +0000 (13:41 +0100)
commit	d36cf9029110268e8ae7f700f620823dcaab5d8e
tree	1b672c324c667d2ec56f26b2f2526a0584f2b0c2	tree \| snapshot
parent	9d060e8d48bd6b2cc8c2a30f3b0eeeb4d867d934	commit \| diff
parent	152898ff2872f2bdf2123a52c37f6e64c18ab88a	commit \| diff

Merge branch 'const_scalar_exprs' into PHP-5.6

Conflicts:
Zend/zend_extensions.h

Zend/zend.h	diff1 \|	diff2 \|	blob \| history
Zend/zend_API.c	diff1 \|	diff2 \|	blob \| history
Zend/zend_compile.c	diff1 \|	diff2 \|	blob \| history
Zend/zend_compile.h	diff1 \|	diff2 \|	blob \| history
Zend/zend_operators.h	diff1 \|	diff2 \|	blob \| history
Zend/zend_vm_def.h	diff1 \|	diff2 \|	blob \| history
Zend/zend_vm_execute.h	diff1 \|	diff2 \|	blob \| history
ext/opcache/zend_accelerator_util_funcs.c	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.