diff options
| author | Stanislav Malyshev <stas@php.net> | 2014-11-23 16:18:52 -0800 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2014-11-23 16:18:52 -0800 |
| commit | faee48506d5a8246577ac9da2d3cba0cac5df752 (patch) | |
| tree | 60c0ca2705de881a9a7cd78abab69c12431efae0 /sapi/phpdbg/phpdbg_cmd.h | |
| parent | 7e4de4f8d65812acc10d7ec1590c42a76d77b384 (diff) | |
| parent | 05394d6056d0798d8b34f90a4a043572e18b470f (diff) | |
| download | php-git-faee48506d5a8246577ac9da2d3cba0cac5df752.tar.gz | |
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.
Diffstat (limited to 'sapi/phpdbg/phpdbg_cmd.h')
0 files changed, 0 insertions, 0 deletions