10 Commits

Author SHA1 Message Date
Stephen Lombardo
2b97c700e9 Merge branch 'sqlite-release' into integration
Conflicts:
	Makefile.in
2009-12-19 15:58:56 -05:00
Stephen Lombardo
090d3d3b9b update to 3.6.21 2009-12-19 15:56:40 -05:00
Stephen Lombardo
063f9cdd2d Merge branch 'sqlite-release' into integration 2009-12-03 16:25:00 -05:00
Stephen Lombardo
7941e188aa track upstream 3.6.20 2009-12-03 16:24:07 -05:00
Stephen Lombardo
6737773707 Merge branch 'sqlite-release' 2009-04-21 10:50:03 -04:00
Stephen Lombardo
81f606f59f track 3.6.13 2009-04-21 10:39:00 -04:00
Stephen Lombardo
cbbb7b2a89 Merge branch 'sqlite-release'
Conflicts:

	Makefile.in
	src/pager.c
	src/pragma.c
	tool/mksqlite3c.tcl
2009-02-20 15:52:39 -05:00
Stephen Lombardo
6e36436ed9 track sqlite 3.6.11 2009-02-20 15:33:35 -05:00
Stephen Lombardo
211a71ea9c identify and exclude tests that cause permanent errors due to encrypted file format 2008-08-01 21:39:17 -04:00
Stephen Lombardo
617ed01e77 commit of sqlite 3.6.0 2008-07-30 09:15:43 -04:00