]> granicus.if.org Git - php/commitdiff
Merge branch 'pull-request/840' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Mon, 24 Nov 2014 00:17:17 +0000 (16:17 -0800)
committerStanislav Malyshev <stas@php.net>
Mon, 24 Nov 2014 00:17:17 +0000 (16:17 -0800)
* pull-request/840:
  Update the VM generation script, per Bob.
  Update NEWS after rebase.
  Add BEGIN_EXTERN_C() and END_EXTERN_C() to .h files missing them.


Trivial merge