Commit Graph

24 Commits

Author SHA1 Message Date
Stephen Lombardo 8a76b73193 Merge branch 'sqlite-release' into integration 2010-08-28 08:38:03 -04:00
Stephen Lombardo 92bc32215d track 3.7.2 2010-08-28 08:35:57 -04:00
Stephen Lombardo 29b781102a Merge branch 'sqlite-release' into integration
Conflicts:
	Makefile.in
	test/quick.test
2010-07-22 09:23:51 -04:00
Stephen Lombardo 7b63a4edde track 3.7.0 2010-07-22 09:16:22 -04:00
Stephen Lombardo 11a0e2bb8f Merge branch 'sqlite-release' into release-integration 2010-05-18 12:24:16 -04:00
Stephen Lombardo 4bb256127b update 3.6.23.1 2010-05-18 12:22:17 -04:00
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 1a81194b38 Merge branch 'sqlite-release' into merge-3.6.17 2009-08-11 16:02:56 -04:00
Stephen Lombardo db1d641a44 update to upstream sqlite 3.6.17 2009-08-11 16:01:51 -04:00
Stephen Lombardo fee0308d2b Merge branch 'sqlite-release' 2009-05-08 05:27:46 -04:00
Stephen Lombardo 7fa21065e9 update to upstream sqlite 3.6.14 2009-05-08 05:27:02 -04: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 7b9260a6e9 renamed codec.* to crypto.* for clarity 2009-02-20 17:26:13 -05: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 88e6a2edf8 support amalgamated builds 2009-02-19 13:09:17 -05:00
Stephen Lombardo d85be36fd7 more fixes to licensing of code 2008-11-30 13:59:21 -05:00
Stephen Lombardo b7979aa5da added simple speed comparison test based on tool/speedtest.tcl 2008-09-11 01:48:24 -04:00
Stephen Lombardo 2893a5d0b2 update baseline to sqlite version 3.6.1 2008-08-19 01:05:45 -04:00
Stephen Lombardo 617ed01e77 commit of sqlite 3.6.0 2008-07-30 09:15:43 -04:00