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: 0c1fa5c eee0861)

author	dan <dan@noemail.net>
	Tue, 10 Jul 2018 15:45:54 +0000 (15:45 +0000)
committer	dan <dan@noemail.net>
	Tue, 10 Jul 2018 15:45:54 +0000 (15:45 +0000)
commit	eb30704cc9c7805829a03eae4c6de41f66799496
tree	3eb5ff07f6e26846c7e4c34f4da8039b85ca2ab0	tree \| snapshot
parent	0c1fa5c8c655b31b1b2765fe7593eabcdc42aea1	commit \| diff
parent	eee08611555199aa56aa99f30e0033a124fd9ff7	commit \| diff

Merge latest trunk changes into this branch.

FossilOrigin-Name: e9a3e8642e7acc8e63b35662ffae3a5a0da8d4f1ecefcb1db3110be19cbdab2b

16 files changed:

main.mk	diff1 \|	diff2 \|	blob \| history
manifest	diff1 \|	diff2 \|	blob \| history
manifest.uuid	diff1 \|	diff2 \|	blob \| history
src/btree.c	diff1 \|	diff2 \|	blob \| history
src/btree.h	diff1 \|	diff2 \|	blob \| history
src/build.c	diff1 \|	diff2 \|	blob \| history
src/main.c	diff1 \|	diff2 \|	blob \| history
src/parse.y	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/vdbeaux.c	diff1 \|	diff2 \|	blob \| history
src/wal.c	diff1 \|	diff2 \|	blob \| history
tool/mkkeywordhash.c	diff1 \|	diff2 \|	blob \| history

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