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: b7ee566 a44005a)

author	dan <dan@noemail.net>
	Tue, 15 May 2018 11:45:47 +0000 (11:45 +0000)
committer	dan <dan@noemail.net>
	Tue, 15 May 2018 11:45:47 +0000 (11:45 +0000)
commit	4921c159bdca24e6b69e9f4bde62168666757b9c
tree	d9a08be3d0b94d0d78cb978767124d2f412a94fd	tree
parent	b7ee5667c29f08436370b2043a74e2608392f534	commit \| diff
parent	a44005af4f37148190e15f77d6702018a78c1718	commit \| diff

Merge latest trunk changes with this branch.

FossilOrigin-Name: ae86cf60b6648a7ec789e233c9b0cc826efbbb0f301140b4848dc84d691ccd4f

12 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/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
src/vdbeaux.c	diff1 \|	diff2 \|	blob \| history

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