com php-src: Merge branch 'PHP-5.5' into PHP-5.6: ext/pgsql/pgsql.c
| From: | Anatol Belski | Date: | Wed, 22 Jan 2014 10:53:56 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.5' into PHP-5.6: ext/pgsql/pgsql.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-75749@lists.php.net to get a copy of this message | ||
Commit: 4247f624cb4f3a83bee0b2624a4ddb8d024bd005
Author: Anatol Belski <ab@php.net> Wed, 22 Jan 2014 11:53:56 +0100
Parents: 3cc6c6c587081178d4c68e9ee1bc021532598ff3 e67ef24227d3fbd4a3ef0a44ada03fea2a6f5263
Branches: PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=4247f624cb4f3a83bee0b2624a4ddb8d024bd005
Log:
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fixed missing usleep() prototype in pgsql
Changed paths:
MM ext/pgsql/pgsql.c
Diff: