diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2013-02-18 16:20:49 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2013-02-18 16:20:49 +0400 |
| commit | d77eb411ea5d80379ee92a908f543b91fa293383 (patch) | |
| tree | 8061e5b3e21fcf046ceaeb036c935429db47f349 /sapi/cli/php_cli_process_title.c | |
| parent | 91538e4e13908a8cfcb25c5286e4222ef4077a7e (diff) | |
| parent | 42437dd870de28eee6c9127f4c7e7c78ba8e0152 (diff) | |
| download | php-git-d77eb411ea5d80379ee92a908f543b91fa293383.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fixed bug #64070 (Inheritance with Traits failed with error)
Conflicts:
NEWS
Zend/zend_compile.c
Diffstat (limited to 'sapi/cli/php_cli_process_title.c')
0 files changed, 0 insertions, 0 deletions