]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorAnatol Belski <ab@php.net>
Wed, 22 Jan 2014 10:53:56 +0000 (11:53 +0100)
committerAnatol Belski <ab@php.net>
Wed, 22 Jan 2014 10:53:56 +0000 (11:53 +0100)
commit4247f624cb4f3a83bee0b2624a4ddb8d024bd005
treee5d305c2ba50495d065f556f7a75157d8ba14dd6
parent3cc6c6c587081178d4c68e9ee1bc021532598ff3
parente67ef24227d3fbd4a3ef0a44ada03fea2a6f5263
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fixed missing usleep() prototype in pgsql
ext/pgsql/pgsql.c