]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 623386d b34e8d2)
Merge branch 'PHP-5.4' into PHP-5.5
authorAndrey Hristov <andrey@php.net>
Wed, 26 Jun 2013 14:50:08 +0000 (16:50 +0200)
committerAndrey Hristov <andrey@php.net>
Wed, 26 Jun 2013 14:50:08 +0000 (16:50 +0200)
Conflicts:
NEWS

1  2 
ext/pgsql/pgsql.c patch | diff1 | diff2 | blob | history

diff --cc ext/pgsql/pgsql.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.