diff options
| author | Julien Pauli <jpauli@php.net> | 2015-07-07 15:03:58 +0200 |
|---|---|---|
| committer | Julien Pauli <jpauli@php.net> | 2015-07-07 15:03:58 +0200 |
| commit | dfb0c6363fd1a4bd75849e4637d7fd31dfc42857 (patch) | |
| tree | 262836bef90c4d9a25e1c318b0b8d4e21b091c38 /sapi/phpdbg/phpdbg_utils.c | |
| parent | 404dc93d35f7061fc4b1b41ad6cb0721b9b52bcc (diff) | |
| parent | c22da81b71abe8c41a94fdea4e95a2bca8ec926d (diff) | |
| download | php-git-dfb0c6363fd1a4bd75849e4637d7fd31dfc42857.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
Fixed double ZEND_TICKS opcode generation for declare()
Conflicts:
Zend/zend_compile.c
Diffstat (limited to 'sapi/phpdbg/phpdbg_utils.c')
0 files changed, 0 insertions, 0 deletions