From: Stanislav Malyshev Date: Mon, 24 Nov 2014 00:18:52 +0000 (-0800) Subject: Merge branch 'PHP-5.5' into PHP-5.6 X-Git-Tag: php-5.6.4RC1~28 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=faee48506d5a8246577ac9da2d3cba0cac5df752;p=php 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. --- faee48506d5a8246577ac9da2d3cba0cac5df752