]> granicus.if.org Git - php/commit
Merge branch 'PHP-7.0' into PHP-7.1
authorDmitry Stogov <dmitry@zend.com>
Thu, 1 Dec 2016 12:50:19 +0000 (15:50 +0300)
committerDmitry Stogov <dmitry@zend.com>
Thu, 1 Dec 2016 12:50:19 +0000 (15:50 +0300)
commitd149ba217ff05a96e28a297ce60189b0a46fb32b
treee2f7c3c41aaf0fd3b1aa26e2e9423aff41a60a4a
parent9c7540d3570c2ff466a6f0db4a4825bbe860307d
parentb7b7dd8cea41f47877095e02374d39d3a75dc4f1
Merge branch 'PHP-7.0' into PHP-7.1

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