diff options
| author | Xinchen Hui <laruence@php.net> | 2012-10-09 13:29:51 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2012-10-09 13:29:51 +0800 |
| commit | e4a8fa6a15d2aa8645d1ad4f4724cb1c628e6916 (patch) | |
| tree | d43f1db77088eedc669c2027e80355f7cdfa06f9 /ext/pdo | |
| parent | 931571260b28bec7c53e57803e03ee0c38e8595e (diff) | |
| parent | 6284ef112ef870b791b8dfab36a39c4664744cc5 (diff) | |
| download | php-git-e4a8fa6a15d2aa8645d1ad4f4724cb1c628e6916.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
Diffstat (limited to 'ext/pdo')
| -rw-r--r--[-rwxr-xr-x] | ext/pdo/pdo.c | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | ext/pdo/pdo_dbh.c | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | ext/pdo/pdo_stmt.c | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | ext/pdo/php_pdo.h | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | ext/pdo/php_pdo_driver.h | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | ext/pdo/php_pdo_int.h | 0 |
6 files changed, 0 insertions, 0 deletions
diff --git a/ext/pdo/pdo.c b/ext/pdo/pdo.c index e0a1c3ce2f..e0a1c3ce2f 100755..100644 --- a/ext/pdo/pdo.c +++ b/ext/pdo/pdo.c diff --git a/ext/pdo/pdo_dbh.c b/ext/pdo/pdo_dbh.c index acdc0dd90d..acdc0dd90d 100755..100644 --- a/ext/pdo/pdo_dbh.c +++ b/ext/pdo/pdo_dbh.c diff --git a/ext/pdo/pdo_stmt.c b/ext/pdo/pdo_stmt.c index 31932eb3c2..31932eb3c2 100755..100644 --- a/ext/pdo/pdo_stmt.c +++ b/ext/pdo/pdo_stmt.c diff --git a/ext/pdo/php_pdo.h b/ext/pdo/php_pdo.h index bc01da2cf8..bc01da2cf8 100755..100644 --- a/ext/pdo/php_pdo.h +++ b/ext/pdo/php_pdo.h diff --git a/ext/pdo/php_pdo_driver.h b/ext/pdo/php_pdo_driver.h index b9c46bae74..b9c46bae74 100755..100644 --- a/ext/pdo/php_pdo_driver.h +++ b/ext/pdo/php_pdo_driver.h diff --git a/ext/pdo/php_pdo_int.h b/ext/pdo/php_pdo_int.h index 16a8f0efb9..16a8f0efb9 100755..100644 --- a/ext/pdo/php_pdo_int.h +++ b/ext/pdo/php_pdo_int.h |