diff options
| author | Julien Pauli <jpauli@php.net> | 2014-12-12 16:14:24 +0100 |
|---|---|---|
| committer | Julien Pauli <jpauli@php.net> | 2014-12-12 16:14:24 +0100 |
| commit | ebe755f14942b63125f6f0ab3054e9d086d28382 (patch) | |
| tree | 2ee489527e42cc6b783d896f7c668a05d2d0d675 /ext/mysql/php_mysql_structs.h | |
| parent | 2e735660d2f46da7b4918a4c9ff92d707e00c264 (diff) | |
| parent | 4cda98264ec4ab80e9ca54c10cf2f332d6e09290 (diff) | |
| download | php-git-ebe755f14942b63125f6f0ab3054e9d086d28382.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
Updated NEWS
Updated NEWS
Fixed Bug #65576 (Constructor from trait conflicts with inherited constructor)
Conflicts:
Zend/zend_compile.c
Diffstat (limited to 'ext/mysql/php_mysql_structs.h')
0 files changed, 0 insertions, 0 deletions