com php-src: Merge branch 'PHP-5.5' into PHP-5.6: ext/pgsql/pgsql.c ext/pgsql/php_pgsql.h
| From: | Yasuo Ohgaki | Date: | Sat, 15 Feb 2014 09:30:11 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.5' into PHP-5.6: ext/pgsql/pgsql.c ext/pgsql/php_pgsql.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-75992@lists.php.net to get a copy of this message | ||
Commit: 5ff9089aeb3145cdaed59668855d135e6fe0ea02
Author: Yasuo Ohgaki <yohgaki@php.net> Sat, 15 Feb 2014 18:30:11 +0900
Parents: 2976f7dae7292e32784fecdbe722744440f91017 6e0b8b4288ac3224c011b913ea93c7654fc04d12
Branches: PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=5ff9089aeb3145cdaed59668855d135e6fe0ea02
Log:
Merge branch 'PHP-5.5' into PHP-5.6
Changed paths:
MM ext/pgsql/pgsql.c
MM ext/pgsql/php_pgsql.h
Diff:
diff --cc ext/pgsql/pgsql.c
index 95cb8f6,a39b4e6..6e64cd2
--- a/ext/pgsql/pgsql.c
+++ b/ext/pgsql/pgsql.c
@@@ -15,11 -15,11 +15,11 @@@
| Authors: Zeev Suraski <zeev@zend.com> |
| Jouni Ahto <jouni.ahto@exdec.fi> |
| Yasuo Ohgaki <yohgaki@php.net> |
- | Youichi Iwakiri <yiwakiri@st.rim.or.jp> (pg_copy_*) |
- | Chris Kings-Lynne <chriskl@php.net> (v3 protocol) |
+ | Youichi Iwakiri <yiwakiri@st.rim.or.jp> (pg_copy_*) |
+ | Chris Kings-Lynne <chriskl@php.net> (v3 protocol) |
+----------------------------------------------------------------------+
*/
-
+
/* $Id$ */
#include <stdlib.h>