status-im/sqlcipher
2
0
Fork 0
mirror of https://github.com/status-im/sqlcipher.git synced 2025-02-23 17:28:17 +00:00
Code Issues Projects Releases Wiki Activity
671 Commits 14 Branches 44 Tags 45 MiB
Commit Graph

69 Commits

Author SHA1 Message Date
Stephen Lombardo
549cee5505 Merge sqlite-release(3.27.2) into prerelease-integration 2019-02-25 15:00:57 -05:00
Stephen Lombardo
49234e8eaf Snapshot of upstream SQLite 3.27.2 2019-02-25 14:46:38 -05:00
Stephen Lombardo
c22eaf85ed Merge sqlite-release(3.27.1) into prerelease-integration 2019-02-10 10:44:20 -05:00
Stephen Lombardo
4745d8a485 Snapshot of upstream SQLite 3.27.1 2019-02-10 10:35:42 -05:00
Stephen Lombardo
bd2f337070 Merge sqlite-release(3.26.0) into prerelease-integration 2018-12-12 20:17:24 -05:00
Stephen Lombardo
4d9565b805 Snapshot of upstream SQLite 3.26.0 2018-12-12 19:43:10 -05:00
Stephen Lombardo
532f48f7f1 Merge sqlite-release(3.25.2) into prerelease-integration 2018-09-28 14:57:11 -04:00
Stephen Lombardo
e62fa4945b Snapshot of upstream SQLite 3.25.2 2018-09-28 14:35:21 -04:00
Stephen Lombardo
e3c5fecbe1 Merge sqlite-release(3.25.0) into prerelease-integration 2018-09-18 12:55:53 -04:00
Stephen Lombardo
bf3fa86130 Snapshot of upstream SQLite 3.25.0 2018-09-18 12:31:37 -04:00
Nick Parker
be789e94dd Merge sqlite-release(3.20.1) into prerelease-integration 2017-09-27 16:12:26 -05:00
Nick Parker
1f3bc22483 Snapshot of upstream SQLite 3.20.1 2017-09-27 16:07:03 -05:00
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 3550fb400a17bb440a5fbea59da6abf8a318b095, reversing
changes made to 4c87a22299b8a6165b6ab9bae8b927f5c7d761ac.
 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
b69e1d36be Rebuild configure to work properly with libtool 2015-07-13 11:54:42 -05: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
f0cf4c5b25 Rebuilt configure from autoconf 2015-03-20 10:04:53 -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
57e8792654 Remove extra block from merge 2014-09-30 11:53:17 -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
Stephen Lombardo
a77ab89179 fix issue in configure with bare comments 2013-10-15 14:26:33 -04:00
Nick Parker
95bb90e33c Merge sqlite-release(3.8.0.2) into prerelease-integration 
Conflicts:
	configure
 2013-10-01 14:36:23 -05:00
Nick Parker
0b3ee4466d Snapshot of upstream SQLite 3.8.0.2 2013-10-01 14:26:57 -05:00
Nick Parker
fd75108661 Merge sqlite-release(3.8.0.1) into prerelease-integration 2013-08-30 16:09:14 -05:00
Nick Parker
679f2be40c Snapshot of upstream SQLite 3.8.0.1 2013-08-30 16:04:26 -05:00
Nick Parker
432585f0f8 Adjustments due to upstream merging 2013-08-29 09:04:14 -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
2c22d1e431 set reported SQLite version back to 3.7.17 2013-06-25 11:03:17 -04:00
Nick Parker
836b4b5108 Adding 'none' option to --with-crypto-lib 
This allows for skipping of the library check, useful when only
preparing the amalgamation.
 2013-06-21 12:19:56 -05:00
Nick Parker
970d88bdb8 Remove SQLCIPHER_CRYPTO_OPENSSL flag for commoncrypto 2013-06-21 10:05:52 -05:00
Nick Parker
be057d3e5f Adjusting the configure template for commoncrypto 2013-06-12 13:45:11 -05:00
Nick Parker
e8a54ad0ef Updated configure script from autoconf 2013-06-12 10:21:44 -05:00
Stephen Lombardo
d85cc20dc8 update to version 2.2.0 2013-05-24 16:37:12 -04:00
Stephen Lombardo
47e8413d24 Merge branch 'deb' into prerelease-int 
Conflicts:
	Makefile.in
	VERSION
	configure
 2013-05-24 16:36:21 -04:00
Nick Parker
67300dfce8 Snapshot of upstream SQLite 3.7.17 2013-05-21 15:38:11 -05:00
Stephen Lombardo
94915f34f5 rebuild configure script 2013-03-20 16:40:14 -04:00
Nick Parker
7d88842525 Snapshot of upstream SQLite 3.7.15.2 2013-01-15 16:38:05 -06:00
Stephen Lombardo
801e036cd8 upstream 3.7.14.1 2012-11-15 18:45:58 -05:00
Stephen Lombardo
de4f34b64d track 3.7.13 2012-07-18 14:42:52 -04:00