]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6' into PHP-7.0
authorChristoph M. Becker <cmb@php.net>
Mon, 25 Jul 2016 00:02:54 +0000 (02:02 +0200)
committerChristoph M. Becker <cmb@php.net>
Mon, 25 Jul 2016 00:02:54 +0000 (02:02 +0200)
commit138fea83fe880749005cf764e9843feb56331a9d
tree148462d4664ffbf3a99e57af2e28f38ca72ea678
parent4db4997ac5b903976d42688c62c0e2216ee6f052
parent305bddb0ede8290fdd53e0c75e71834e0dc63512
Merge branch 'PHP-5.6' into PHP-7.0

# Resolved conflicts:
# ext/gd/tests/gd_info_variation1.phpt
ext/gd/tests/gd_info_variation1.phpt