projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 02dca18 9ed6058)
Merge branch 'PHP-5.4' into PHP-5.5
authorDmitry Stogov <dmitry@zend.com>
Mon, 2 Dec 2013 07:02:40 +0000 (11:02 +0400)
committerDmitry Stogov <dmitry@zend.com>
Mon, 2 Dec 2013 07:02:40 +0000 (11:02 +0400)
commit7efcbecda99c5c0f2cdf2b686f33cafc6c6460b3
tree8cc5198717b22ad6ffd46bbbb51b545e52d9228dtree | snapshot
parent02dca18b9045029e75d672b8667c1411dde5ca34commit | diff
parent9ed605892de40bf4b005198199139d5207957e6bcommit | diff
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
Zend/zend_vm_gen.php diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.