]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7e4de4f 05394d6)
Merge branch 'PHP-5.5' into PHP-5.6
authorStanislav Malyshev <stas@php.net>
Mon, 24 Nov 2014 00:18:52 +0000 (16:18 -0800)
committerStanislav Malyshev <stas@php.net>
Mon, 24 Nov 2014 00:18:52 +0000 (16:18 -0800)
commitfaee48506d5a8246577ac9da2d3cba0cac5df752
tree60c0ca2705de881a9a7cd78abab69c12431efae0tree | snapshot
parent7e4de4f8d65812acc10d7ec1590c42a76d77b384commit | diff
parent05394d6056d0798d8b34f90a4a043572e18b470fcommit | diff
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  update NEWS
  Update the VM generation script, per Bob.
  Update NEWS after rebase.
  Add BEGIN_EXTERN_C() and END_EXTERN_C() to .h files missing them.
Zend/zend_vm_gen.php diff1 | diff2 | blob | history
Zend/zend_vm_opcodes.h diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.