granicus.if.org Git - php/commit

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

projects / php / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 293a48c a7d1656)

author	Ferenc Kovacs <tyrael@php.net>
	Sun, 29 Jun 2014 23:34:05 +0000 (01:34 +0200)
committer	Ferenc Kovacs <tyrael@php.net>
	Sun, 29 Jun 2014 23:34:05 +0000 (01:34 +0200)
commit	a52616b759eae58e2b2d158c3f5babccd0b23469
tree	f2ab6b6e9616bedb8ab8cc8397e7e6fb3564f997	tree \| snapshot
parent	293a48cb9df040d769e03a8c262e15b9f880333a	commit \| diff
parent	a7d1656b96ad33ab31309fc505692793d4b4731f	commit \| diff

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fix bug #67091: make install fails to install libphp5.so on FreeBSD 10.0

build/libtool.m4

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