Public Git Hosting - sqlcipher.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: c867151 93c24ef)

commit	36f4798ce0b5a5da3b02d6a20d7db5e75864aaf1
author	Stephen Lombardo <sjlombardo@zetetic.net>
	Fri, 30 Dec 2022 17:19:05 +0000 (30 12:19 -0500)
committer	Stephen Lombardo <sjlombardo@zetetic.net>
	Fri, 30 Dec 2022 17:19:05 +0000 (30 12:19 -0500)
tree	d322e7487cccbbdfa00ca650f95fd2225457bddb	tree \| snapshot (tar.gz zip)
parent	c867151ba5e2302be078b63db444581c46bcad72	commit \| diff
parent	93c24ef16c2114d91a0bca6acdc32d1cd6eefb4a	commit \| diff

Merge sqlite-release(3.40.1) into prerelease-integration

18 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
sqlite_cfg.h.in	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/shell.c.in	diff1 \|	diff2 \|	blob \| history
src/sqlite.h.in	diff1 \|	diff2 \|	blob \| history
src/sqliteInt.h	diff1 \|	diff2 \|	blob \| history
src/test1.c	diff1 \|	diff2 \|	blob \| history
src/vacuum.c	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.