]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6' into PHP-7.0
authorDmitry Stogov <dmitry@zend.com>
Thu, 1 Dec 2016 12:50:05 +0000 (15:50 +0300)
committerDmitry Stogov <dmitry@zend.com>
Thu, 1 Dec 2016 12:50:05 +0000 (15:50 +0300)
commitb7b7dd8cea41f47877095e02374d39d3a75dc4f1
treef775151c4ceab792c8431b1cf8b6ef296f8843fa
parent043d8e2fe1391494b666abaeedc20f04fa1a109e
parent1cd566e13f915ccd06a1140d04d4d946748ad021
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Workaround for GCC-4.9.2 bug
  oops, changed in wrong place
ext/intl/grapheme/grapheme_string.c