projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f22bc64 4c24f17)
Merge branch 'PHP-5.6' into PHP-7.0
authorChristoph M. Becker <cmb@php.net>
Tue, 5 Jul 2016 14:43:39 +0000 (16:43 +0200)
committerChristoph M. Becker <cmb@php.net>
Tue, 5 Jul 2016 14:43:39 +0000 (16:43 +0200)
commitc0150950425710bc84249c38fb09a9031f19fba0
treea5369b418484da6f723ba071175d800dbcb0c6aatree | snapshot
parentf22bc6438dcaf55bf80e7be972f3374d31dbaae5commit | diff
parent4c24f170ea3701c9aadde6c575a777ee4027f463commit | diff
Merge branch 'PHP-5.6' into PHP-7.0

# Resolved conflicts:
# ext/spl/spl_directory.c
ext/spl/spl_directory.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.