diff options
| author | Julien Pauli <jpauli@php.net> | 2014-11-28 13:26:53 +0100 |
|---|---|---|
| committer | Julien Pauli <jpauli@php.net> | 2014-11-28 13:26:53 +0100 |
| commit | b248a7a95c00de3e47b2d589d75d719a8fc70dfb (patch) | |
| tree | 274ef8a0129a6c0e187e2e08f1fb44d15c9a80ba /sapi/cli/php_http_parser.h | |
| parent | 1552d6ae7bb2b2f13a268b035b2fcb83a7c2a0df (diff) | |
| parent | 619adc9795f925531196c5b7e4797453130eac98 (diff) | |
| download | php-git-b248a7a95c00de3e47b2d589d75d719a8fc70dfb.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
updated NEWS
Fix #65419 - Inside trait, self::class != __CLASS__
Diffstat (limited to 'sapi/cli/php_http_parser.h')
0 files changed, 0 insertions, 0 deletions