granicus.if.org Git - php/commit

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

projects / php / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 765b0ee 2e02f18)

author	Adam Harvey <aharvey@php.net>
	Tue, 1 Jul 2014 20:25:55 +0000 (13:25 -0700)
committer	Adam Harvey <aharvey@php.net>
	Tue, 1 Jul 2014 20:25:55 +0000 (13:25 -0700)
commit	d1adf55c15eec332984fb70de2dabc9704337719
tree	5e0a1b4743707b0212368dd45f6d72b56f8737aa	tree \| snapshot
parent	765b0ee715b4c4fc1cf4935bbf0fdfcd61cf0b7d	commit \| diff
parent	2e02f18b154bb00279e5d121cc36beea7b9b8f37	commit \| diff

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Fix ext/pgsql builds with libpq < 7.3.

NEWS	diff1 \|	diff2 \|	blob \| history
ext/pgsql/pgsql.c	diff1 \|	diff2 \|	blob \| history

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