Public Git Hosting - sqlcipher.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 1f3e378 90401f0)

commit	ee855a2062f42810728df76e4e5dc6d9b347d371
author	Stephen Lombardo <sjlombardo@zetetic.net>
	Fri, 7 Jan 2022 17:41:37 +0000 (7 12:41 -0500)
committer	Stephen Lombardo <sjlombardo@zetetic.net>
	Fri, 7 Jan 2022 17:41:37 +0000 (7 12:41 -0500)
tree	77d7a83deb83931d9b0076a2596a0bcaffa3a52f	tree \| snapshot (tar.gz zip)
parent	1f3e3782adffc557ca49f620b299a727023b18cb	commit \| diff
parent	90401f041e4d351e3e9cae0ddcb1cfffcd71ae7e	commit \| diff

Merge sqlite-release(3.37.2) into prerelease-integration

24 files changed:

Makefile.in	diff1 \|	diff2 \|	blob \| history
Makefile.msc	diff1 \|	diff2 \|	blob \| history
configure	diff1 \|	diff2 \|	blob \| history
configure.ac	diff1 \|	diff2 \|	blob \| history
src/attach.c	diff1 \|	diff2 \|	blob \| history
src/ctime.c	diff1 \|	diff2 \|	blob \| history
src/func.c	diff1 \|	diff2 \|	blob \| history
src/global.c	diff1 \|	diff2 \|	blob \| history
src/main.c	diff1 \|	diff2 \|	blob \| history
src/malloc.c	diff1 \|	diff2 \|	blob \| history
src/pager.c	diff1 \|	diff2 \|	blob \| history
src/pragma.c	diff1 \|	diff2 \|	blob \| history
src/pragma.h	diff1 \|	diff2 \|	blob \| history
src/shell.c.in	diff1 \|	diff2 \|	blob \| history
src/sqlite.h.in	diff1 \|	diff2 \|	blob \| history
src/sqliteInt.h	diff1 \|	diff2 \|	blob \| history
src/tclsqlite.c	diff1 \|	diff2 \|	blob \| history
src/test1.c	diff1 \|	diff2 \|	blob \| history
src/test_config.c	diff1 \|	diff2 \|	blob \| history
src/util.c	diff1 \|	diff2 \|	blob \| history
src/vacuum.c	diff1 \|	diff2 \|	blob \| history
src/wal.c	diff1 \|	diff2 \|	blob \| history
tool/mkpragmatab.tcl	diff1 \|	diff2 \|	blob \| history
tool/mksqlite3c.tcl	diff1 \|	diff2 \|	blob \| history

SQLCipher is an SQLite extension that provides 256 bit AES encryption of database files.