diff options
| author | Anatol Belski <ab@php.net> | 2014-12-12 13:26:17 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-12-12 13:26:17 +0100 |
| commit | f4311686cc2c7d07abce2b752b4e8597771c5b25 (patch) | |
| tree | a479b88e6f8d3c6ed094a6451b36c0e2189a3f87 /sapi/phpdbg/phpdbg_opcode.c | |
| parent | 5dbeb9e65eb01fb974cd88025a4054f4e51bdbf2 (diff) | |
| parent | b1709b8ff0ad3a4beb1b560301d886aa49946599 (diff) | |
| download | php-git-f4311686cc2c7d07abce2b752b4e8597771c5b25.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
updated NEWS
Fixed bug #68583 Crash in timeout thread
Conflicts:
Zend/zend_execute.h
Zend/zend_execute_API.c
Diffstat (limited to 'sapi/phpdbg/phpdbg_opcode.c')
0 files changed, 0 insertions, 0 deletions