]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6c8dd3e 5602f64)
Merge branch 'PHP-7.0'
authorNikita Popov <nikic@php.net>
Thu, 3 Mar 2016 22:20:50 +0000 (23:20 +0100)
committerNikita Popov <nikic@php.net>
Thu, 3 Mar 2016 22:20:50 +0000 (23:20 +0100)
Conflicts:
ext/mysqlnd/mysqlnd_priv.h
main/php_streams.h


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.