diff options
| author | Johannes Schlüter <johannes@php.net> | 2012-06-22 12:50:30 +0200 |
|---|---|---|
| committer | Johannes Schlüter <johannes@php.net> | 2012-06-22 12:50:30 +0200 |
| commit | af516750ff32f69c1df10155fa8ec0c9cc5b70ff (patch) | |
| tree | 5e663b048773da88b2b3ba24b507a06e61e43269 /ext/mysqlnd/php_mysqlnd.c | |
| parent | 041dd77135c89af821b483a3c1f485bfaf6cfb50 (diff) | |
| parent | 055ecbc62878e86287d742c7246c21606cee8183 (diff) | |
| download | php-git-af516750ff32f69c1df10155fa8ec0c9cc5b70ff.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Improve check for :memory: pseudo-filename in SQlite
Conflicts:
ext/sqlite3/sqlite3.c
Diffstat (limited to 'ext/mysqlnd/php_mysqlnd.c')
0 files changed, 0 insertions, 0 deletions