diff options
| author | Stanislav Malyshev <stas@php.net> | 2013-01-01 21:20:35 -0800 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2013-01-01 21:20:35 -0800 |
| commit | 80a9a80a52d1eb0281cd2894be05c685e4d526a0 (patch) | |
| tree | e9e3eafbe1e1000cba2c5ca90efd6c4c954fcbeb /ext/sqlite3/libsqlite/php-sqlite3-changes.patch | |
| parent | 343a9199bbbf4f63b02099ceef27ef9881d8aa9f (diff) | |
| parent | 36e19c9cab6cce4e44782563f590c6c4560fb187 (diff) | |
| download | php-git-80a9a80a52d1eb0281cd2894be05c685e4d526a0.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Bug #43177: If an eval() has a parse error, the overall exit status and return code should not be affected.
fix NEWS
Conflicts:
main/main.c
Diffstat (limited to 'ext/sqlite3/libsqlite/php-sqlite3-changes.patch')
0 files changed, 0 insertions, 0 deletions