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: ac33c03 dc62dac)

author	dan <dan@noemail.net>
	Thu, 20 Apr 2017 17:35:46 +0000 (17:35 +0000)
committer	dan <dan@noemail.net>
	Thu, 20 Apr 2017 17:35:46 +0000 (17:35 +0000)
commit	c42a0056d7817f629d78de5d285e2df189ceb10e
tree	80269bfa40a3837a9b99fe062257f9779217df4a	tree \| snapshot
parent	ac33c0343f54bca37411b9f4b11115f7a583b241	commit \| diff
parent	dc62daca866006c4afa4c32c405d1a327dc7334f	commit \| diff

Merge latest trunk changes into this branch.

FossilOrigin-Name: b1533bc455f52f570c0f4b8aaa0da802757dc89b0e45b9a9b31aa591a44bf7bd

ext/expert/sqlite3expert.c	diff1 \|	\|	blob \| history
manifest	diff1 \|	diff2 \|	blob \| history
manifest.uuid	diff1 \|	diff2 \|	blob \| history
src/pragma.c	diff1 \|	diff2 \|	blob \| history
src/vdbe.c	diff1 \|	diff2 \|	blob \| history
src/where.c	diff1 \|	diff2 \|	blob \| history
test/permutations.test	diff1 \|	diff2 \|	blob \| history

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