com php-src: Merge branch 'PHP-5.6' into PHP-7.0: ext/sqlite3/sqlite3.c
| From: | Christoph Michael Becker | Date: | Mon, 25 Jul 2016 15:07:41 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.6' into PHP-7.0: ext/sqlite3/sqlite3.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-93392@lists.php.net to get a copy of this message | ||
Commit: ccf39dd55243054535be02261485d56fbe5539d5
Author: Christoph M. Becker <cmb@php.net> Mon, 25 Jul 2016 17:07:41 +0200
Parents: f5e56cf9707a1be547cc29f568d6f60dbdbb1e4c 64e3e932fc38dc7e59805dfb28acae173503018b
Branches: PHP-7.0 PHP-7.1 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=ccf39dd55243054535be02261485d56fbe5539d5
Log:
Merge branch 'PHP-5.6' into PHP-7.0
# Resolved conflicts:
# ext/sqlite3/sqlite3.c
# ext/sqlite3/tests/bug72668.phpt
Bugs:
https://bugs.php.net/72668
Changed paths:
MM ext/sqlite3/sqlite3.c
Diff: