status-im
/
sqlcipher
mirror of https://github.com/status-im/sqlcipher.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
529 Commits 14 Branches 44 Tags 45 MiB
Commit Graph

52 Commits

Author SHA1 Message Date
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
Stephen Lombardo 35a66a5caa track 3.7.12.1 2012-05-23 09:26:02 -04:00
Stephen Lombardo c8c482ab80 track 3.7.12 2012-05-15 19:05:34 -04:00
Stephen Lombardo d09051a1f2 track 3.7.10 2012-01-18 00:18:26 -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 92bc32215d track 3.7.2 2010-08-28 08:35:57 -04:00
Stephen Lombardo 953ca18eb6 track 3.7.0.1 2010-08-06 23:07:48 -04:00
Stephen Lombardo 7b63a4edde track 3.7.0 2010-07-22 09:16:22 -04:00
Stephen Lombardo 4bb256127b update 3.6.23.1 2010-05-18 12:22:17 -04:00
Stephen Lombardo 090d3d3b9b update to 3.6.21 2009-12-19 15:56:40 -05:00
Stephen Lombardo 7941e188aa track upstream 3.6.20 2009-12-03 16:24:07 -05:00
Stephen Lombardo db1d641a44 update to upstream sqlite 3.6.17 2009-08-11 16:01:51 -04:00
Stephen Lombardo b9df4d3c78 regenerated broken upstream configure script using autoconf 2009-05-08 05:30:31 -04:00
Stephen Lombardo 81f606f59f track 3.6.13 2009-04-21 10:39:00 -04:00
Stephen Lombardo 6e36436ed9 track sqlite 3.6.11 2009-02-20 15:33:35 -05:00