status-im/sqlcipher
1
0
Fork 0
mirror of https://github.com/status-im/sqlcipher.git synced 2026-08-31 14:31:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
534 Commits 14 Branches 44 Tags
bae72ae4e3758dcd3dbd7431ff4bad9205ce531d
Commit Graph
67 Commits
Author SHA1 Message Date
Nick Parker bae72ae4e3 Merge sqlite-release(3.15.2) into prerelease-integration 2016-12-06 13:10:27 -06:00
Nick Parker 51ec837e61 Snapshot of upstream SQLite 3.15.2 2016-12-05 14:29:15 -06:00
Nick Parker 1dd36b8384 Merge remote-tracking branch 'origin/sqlite-release' into prerelease-integration 2016-12-05 14:09:57 -06:00
Nick Parker 5958df7f25 Revert "Merge sqlite-release(3.11.0) into prerelease-integration" 
This reverts commit 3550fb400a, reversing
changes made to 4c87a22299.
 2016-12-02 16:24:56 -06:00
Nick Parker 9644b9fe85 Snapshot of upstream SQLite 3.11.0 2016-02-23 09:07:39 -06:00
Nick Parker 3550fb400a Merge sqlite-release(3.11.0) into prerelease-integration 2016-02-22 11:20:06 -06:00
Nick Parker 376eb11e20 Snapshot of upstream SQLite 3.11.0 2016-02-22 10:40:43 -06:00
Nick Parker 595ef07930 Merge sqlite-release(3.8.10.2) into prerelease-integration 2015-07-10 14:30:07 -05:00
Nick Parker 724d1aac99 Snapshot of upstream SQLite 3.8.10.2 2015-07-10 14:14:29 -05:00
Nick Parker edf2c86154 Merge sqlite-release(3.8.8.3) into prerelease-integration 2015-03-20 09:37:39 -05:00
Nick Parker d4954191b9 Snapshot of upstream SQLite 3.8.8.3 2015-03-20 09:04:26 -05:00
Nick Parker 683a5e7b8e Merge sqlite-release(3.8.6) into prerelease-integration 2014-09-30 08:45:24 -05:00
Nick Parker 0b99d5d75c Snapshot of upstream SQLite 3.8.6 2014-09-30 08:40:45 -05:00
Nick Parker 82db0d7e90 Merge sqlite-release(3.8.4.3) into prerelease-integration 
Conflicts:
	Makefile.in
	README
	VERSION
	configure
	manifest
	manifest.uuid
	sqlcipher.1
	src/pragma.c
	src/shell.c
 2014-04-04 13:16:23 -05:00
Nick Parker 6eeedff248 Snapshot of upstream SQLite 3.8.4.3 2014-04-04 10:16:20 -05:00
Nick Parker 897f402696 Merge sqlite-release(3.8.0) into prerelease-integration 
Conflicts:
	configure
	ext/misc/closure.c
	ext/misc/fuzzer.c
	ext/misc/ieee754.c
	ext/misc/nextchar.c
	ext/misc/regexp.c
	ext/misc/spellfix.c
	magic.txt
	src/test_fs.c
	test/backup4.test
	test/btreefault.test
	test/close.test
	test/fts3expr3.test
	test/fts3tok1.test
	test/fts3tok_err.test
	test/incrvacuum3.test
	test/ioerr6.test
	test/orderby1.test
	test/resolver01.test
	test/tkt-7a31705a7e6.test
	test/transitive1.test
	test/whereE.test
	test/whereF.test
 2013-08-29 08:22:50 -05:00
Nick Parker 45915dda5d Snapshot of upstream SQLite 3.8.0 2013-08-29 08:11:18 -05:00
Stephen Lombardo a828432a72 normalize license statements, ifdefs, and wrapper comments 2013-06-12 11:01:38 -04:00
Nick Parker 297e94d2c2 Merge sqlite-release(3.7.17) into prerelease-integration 
Conflicts:
	src/pragma.c
 2013-05-21 15:42:46 -05:00
Nick Parker 67300dfce8 Snapshot of upstream SQLite 3.7.17 2013-05-21 15:38:11 -05:00
Nick Parker 7d88842525 Snapshot of upstream SQLite 3.7.15.2 2013-01-15 16:38:05 -06:00
Nick Parker a28a2a2309 Merge sqlite-release(3.7.15.2) into prerelease-integration 2013-01-15 16:38:05 -06:00
Stephen Lombardo 58acc8269f Merge branch 'sqlite-release' into prerelease-int 2012-11-15 18:46:41 -05:00
Stephen Lombardo 801e036cd8 upstream 3.7.14.1 2012-11-15 18:45:58 -05:00
Stephen Lombardo aec2fe4efc Merge branch 'sqlite-release' into prerelease-integration 2012-07-18 14:43:41 -04:00
Stephen Lombardo de4f34b64d track 3.7.13 2012-07-18 14:42:52 -04:00
Stephen Lombardo f018888ed8 Merge branch 'release-integration' 2012-05-15 20:49:14 -04:00
Stephen Lombardo f09f9f908a error out if key_sz is ever 0 due to context corruption 2012-05-15 20:48:10 -04:00
Stephen Lombardo 53c6fc9f5f Merge branch 'sqlite-release' into release-integration 2012-05-15 19:06:40 -04:00
Stephen Lombardo c8c482ab80 track 3.7.12 2012-05-15 19:05:34 -04:00
Stephen Lombardo eb9b65750d Merge branch 'sqlite-release' into release-merge 2012-01-18 00:19:02 -05:00
Stephen Lombardo d09051a1f2 track 3.7.10 2012-01-18 00:18:26 -05:00
Stephen Lombardo dea8ae9ace Merge branch 'sqlite-release' into release-integration 
Conflicts:
	Makefile.in
 2011-12-26 15:00:48 -05:00
Stephen Lombardo ddb595fbc9 upstream 3.7.9 2011-12-26 14:52:17 -05:00
Stephen Lombardo 12069ec913 track 3.7.7.1 2011-08-17 13:17:32 -04:00
Stephen Lombardo 7cffc8807d track 3.7.6.2 2011-05-05 22:37:34 -04:00
Stephen Lombardo fc5fc812f6 track 3.7.5 2011-02-16 16:14:46 -05:00
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 982f416442 add missing sqlite3PageFree and sqlite3PcacheClose to sqlite3PagerClose missed in previous merge 2009-12-20 00:05:44 -05: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 84e17044df sqlcipher compatibility changes for upstream 3.6.17 2009-08-11 16:49:37 -04:00
Stephen Lombardo 1a81194b38 Merge branch 'sqlite-release' into merge-3.6.17 2009-08-11 16:02:56 -04:00