]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorAnatol Belski <ab@php.net>
Sun, 12 Oct 2014 17:22:40 +0000 (19:22 +0200)
committerAnatol Belski <ab@php.net>
Sun, 12 Oct 2014 17:22:40 +0000 (19:22 +0200)
* PHP-5.6:
  DLL export several APIs needed for phpdbg

1  2 
Zend/zend.c
Zend/zend_API.c
Zend/zend_API.h
Zend/zend_extensions.h

diff --cc Zend/zend.c
Simple merge
diff --cc Zend/zend_API.c
Simple merge
diff --cc Zend/zend_API.h
Simple merge
Simple merge