git.ipfire.org Git - thirdparty/sqlite.git/commit

]> git.ipfire.org Git - thirdparty/sqlite.git/commit

projects / thirdparty / sqlite.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: dbbb934 43e8627)

author	drh <drh@noemail.net>
	Thu, 9 Apr 2020 18:51:29 +0000 (18:51 +0000)
committer	drh <drh@noemail.net>
	Thu, 9 Apr 2020 18:51:29 +0000 (18:51 +0000)
commit	154e36ab544c0b6a478c0166c63a29b14ce96b0c
tree	09ac3a8ee32ee1c10b04636f4219902ffba1b669	tree
parent	dbbb9343ebbf642be375286df0f7b501c3cd00dd	commit \| diff
parent	43e862723ec680542ca6f608f9963c0993dd7324	commit \| diff

Merge recent trunk changes into the apple-osx branch.

FossilOrigin-Name: d6fda470fe3e2932ab3065211413cc7e9f035635d9cfa23eeeff81463dcc17eb

22 files changed:

ext/rtree/rtree.c	diff1 \|	diff2 \|	blob \| history
manifest	diff1 \|	diff2 \|	blob \| history
manifest.uuid	diff1 \|	diff2 \|	blob \| history
src/btree.c	diff1 \|	diff2 \|	blob \| history
src/btreeInt.h	diff1 \|	diff2 \|	blob \| history
src/main.c	diff1 \|	diff2 \|	blob \| history
src/os_unix.c	diff1 \|	diff2 \|	blob \| history
src/pager.c	diff1 \|	diff2 \|	blob \| history
src/pager.h	diff1 \|	diff2 \|	blob \| history
src/pragma.c	diff1 \|	diff2 \|	blob \| history
src/prepare.c	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/test_config.c	diff1 \|	diff2 \|	blob \| history
src/vdbe.c	diff1 \|	diff2 \|	blob \| history
src/vdbeapi.c	diff1 \|	diff2 \|	blob \| history
src/wal.c	diff1 \|	diff2 \|	blob \| history
test/altertab.test	diff1 \|	diff2 \|	blob \| history
test/attach.test	diff1 \|	diff2 \|	blob \| history
test/tester.tcl	diff1 \|	diff2 \|	blob \| history
test/window1.test	diff1 \|	diff2 \|	blob \| history

Mirror of https://github.com/sqlite/sqlite.git