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
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
35b4d9a425
initial implementation of CommonCrypto provider
2013-06-05 13:43:08 -04:00
Stephen Lombardo
5296f3334b
fixup build to include new sqlcipher.h
2013-05-31 02:40:08 -04:00
Stephen Lombardo
c7f1d14ded
providers accessed via function pointers
2013-05-31 00:52:19 -04:00
Nick Parker
e44f59f2b3
Add support for --with-crypto-lib from autoconf
...
The default configure script generated from autoconf will default to
using OpenSSL as the crypto library. With the new --with-crypto-lib
flag, users can specify libtomcrypto as an alternative crypto library.
2013-06-03 16:45:44 -05:00
Nick Parker
f6e4ed4783
Initial commit with support for using libtomcrypt.
2013-05-31 14:40:12 -05:00
Nick Parker
f413acf207
Pull crypto_openssl into Makefile.in for building
2013-05-29 15:10:48 -05: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
3f81bbc668
Merge branch 'master' of github.com:sqlcipher/sqlcipher
2012-05-17 12:35:59 -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
b6302e30a2
disable key initialization on the no-encryption speed test
2012-05-07 11:05:22 -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
522a3d0934
Merge branch 'master' into v2beta
...
Conflicts:
Makefile.in
2011-12-26 15:29:56 -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
648c4e50fe
Merge branch 'sqlite-release' into release-integration
2011-08-17 13:18:08 -04:00
Stephen Lombardo
12069ec913
track 3.7.7.1
2011-08-17 13:17:32 -04:00
Stephen Lombardo
f5c62a0fd1
Merge branch 'sqlite-release' into integration
2011-05-05 22:39:20 -04:00
Stephen Lombardo
7cffc8807d
track 3.7.6.2
2011-05-05 22:37:34 -04:00
