granicus.if.org Git - php/commit

]> granicus.if.org Git - php/commit

projects / php / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 5b46c2b 54d8053)

author	Anatol Belski <ab@php.net>
	Thu, 22 Sep 2016 23:55:17 +0000 (01:55 +0200)
committer	Anatol Belski <ab@php.net>
	Thu, 22 Sep 2016 23:55:17 +0000 (01:55 +0200)
commit	f7e5481a10ce0b4041893ed298f89574ab07e27d
tree	bc6e9fe564c223d3a2c2212be958e6b3e4d8109c	tree \| snapshot
parent	5b46c2b67d2e1d68d8fb1b0a6584906366983b9e	commit \| diff
parent	54d8053ac5008efa122211b2aeec57a4931f5d56	commit \| diff

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
Fix bug #73121 Bundled PCRE doesn't compile because JIT isn't supported on s390

ext/pcre/php_pcre.c

Unnamed repository; edit this file 'description' to name the repository.