delta/php-git.git/ext/sqlite3, branch php-5.5.0alpha1 git.php.net: repository/php-src.git Merge branch 'PHP-5.4' 2012-07-01T00:00:25+00:00 Stanislav Malyshev stas@php.net 2012-07-01T00:00:25+00:00 a3322f8927618a8cadbef4ae2121084b44a564d3 * PHP-5.4: Fixed the common misspelling of the word occurred (occured -> occurred) 
* PHP-5.4:
  Fixed the common misspelling of the word occurred (occured -> occurred)
Fixed the common misspelling of the word occurred (occured -> occurred) 2012-06-30T23:54:03+00:00 Marc Easen marc@easen.co.uk 2012-06-11T20:47:40+00:00 896ac689c91967dec0601fa9fe048c518da52a3c 






Merge branch 'PHP-5.4'
2012-06-22T10:50:55+00:00

Johannes Schlüter
johannes@php.net

2012-06-22T10:50:55+00:00

4f5c7ee24074d2de5f4a8569007d3fa31e3f9386

* PHP-5.4:
  Improve check for :memory: pseudo-filename in SQlite





* PHP-5.4:
  Improve check for :memory: pseudo-filename in SQlite







Merge branch 'PHP-5.3' into PHP-5.4
2012-06-22T10:50:30+00:00

Johannes Schlüter
johannes@php.net

2012-06-22T10:50:30+00:00

af516750ff32f69c1df10155fa8ec0c9cc5b70ff

* PHP-5.3:
  Improve check for :memory: pseudo-filename in SQlite

Conflicts:
	ext/sqlite3/sqlite3.c





* PHP-5.3:
  Improve check for :memory: pseudo-filename in SQlite

Conflicts:
	ext/sqlite3/sqlite3.c







Improve check for :memory: pseudo-filename in SQlite
2012-06-22T10:48:39+00:00

Johannes Schlüter
johannes@php.net

2012-06-22T10:48:39+00:00

055ecbc62878e86287d742c7246c21606cee8183












Merge branch 'PHP-5.4'
2012-04-26T13:18:17+00:00

Anatoliy Belsky
ab@php.net

2012-04-26T13:18:17+00:00

6996a51d590a3ebd09d436ea1c64f1863d99bc6a

* PHP-5.4:
  Fix bug #61791 ext\sqlite3\tests\sqlite3_15_open_error.phpt fails





* PHP-5.4:
  Fix bug #61791 ext\sqlite3\tests\sqlite3_15_open_error.phpt fails







Merge branch 'PHP-5.3' into PHP-5.4
2012-04-26T13:17:46+00:00

Anatoliy Belsky
ab@php.net

2012-04-26T13:17:46+00:00

94d96f77826e46f114d4bc1777e1edcdfef002a2

* PHP-5.3:
  Fix bug #61791 ext\sqlite3\tests\sqlite3_15_open_error.phpt fails

Conflicts:
	ext/sqlite3/tests/sqlite3_15_open_error.phpt





* PHP-5.3:
  Fix bug #61791 ext\sqlite3\tests\sqlite3_15_open_error.phpt fails

Conflicts:
	ext/sqlite3/tests/sqlite3_15_open_error.phpt







Fix bug #61791 ext\sqlite3\tests\sqlite3_15_open_error.phpt fails
2012-04-26T13:14:26+00:00

Anatoliy Belsky
ab@php.net

2012-04-26T13:14:26+00:00

4daab0abecd5ee583c005d8e7b6affc08af8639d












remove -dev for release
2012-02-28T18:43:44+00:00

Stanislav Malyshev
stas@php.net

2012-02-28T18:43:44+00:00

f43330a37162afaaa12b8fa10d41470da57686f4












Missed the test
2012-01-29T04:20:50+00:00

Rasmus Lerdorf
rasmus@php.net

2012-01-29T04:20:50+00:00

9722bff0c337f015ecda5d072049ca599e2f7e71