diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2013-12-02 11:02:40 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2013-12-02 11:02:40 +0400 |
| commit | 7efcbecda99c5c0f2cdf2b686f33cafc6c6460b3 (patch) | |
| tree | 8cc5198717b22ad6ffd46bbbb51b545e52d9228d /sapi/tux/php_tux.c | |
| parent | 02dca18b9045029e75d672b8667c1411dde5ca34 (diff) | |
| parent | 9ed605892de40bf4b005198199139d5207957e6b (diff) | |
| download | php-git-7efcbecda99c5c0f2cdf2b686f33cafc6c6460b3.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fixed ability to build non-specialized GOTO VM
Conflicts:
Zend/zend_vm_gen.php
Diffstat (limited to 'sapi/tux/php_tux.c')
0 files changed, 0 insertions, 0 deletions