granicus.if.org Git - php/commit

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

projects / php / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: f8f6bd7 982342b)

author	Anatol Belski <ab@php.net>
	Fri, 18 Jul 2014 16:40:58 +0000 (18:40 +0200)
committer	Anatol Belski <ab@php.net>
	Fri, 18 Jul 2014 16:40:58 +0000 (18:40 +0200)
commit	47e640164affa17820f8db3c620cd6fccfa317b3
tree	ebb6a4f832badbc23254f1dd6e39994bcd76be36	tree \| snapshot
parent	f8f6bd7a081b8786cc9f0052c6e32f6783355fa1	commit \| diff
parent	982342b057d6ef811367ff804751d0d901a529b7	commit \| diff

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
implemented copy libs of core exts in phpize mode

win32/build/confutils.js

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