]> granicus.if.org Git - php/commit
Merge branch 'PHP-7.0' into PHP-7.1
authorRemi Collet <remi@php.net>
Tue, 4 Jul 2017 18:26:53 +0000 (20:26 +0200)
committerRemi Collet <remi@php.net>
Tue, 4 Jul 2017 18:26:53 +0000 (20:26 +0200)
commit1fa8e74d6eebaa19174ea56581f23b13e6b77000
treec8ecd40f5ae3e64db1754c60dfe96cbdbfd010d4
parent41ba98f02d6ce4c7572ef2b7856defead7d232ac
parent4b38feabe745b553703cd53f37615b955502f4e7
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Adapt for 32-bits which fails at different offset (49 vs 38)