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: 8498f38 c66d03f)

author	dan <dan@noemail.net>
	Sat, 23 Jan 2016 16:20:16 +0000 (16:20 +0000)
committer	dan <dan@noemail.net>
	Sat, 23 Jan 2016 16:20:16 +0000 (16:20 +0000)
commit	e17b646fd5be41e075c7c8cd287747327748ec36
tree	f91f2bfbf5657f43251f82415f26a265dbc7d4c9	tree \| snapshot
parent	8498f387be1e02e4053c4bf5dcf4ded8a7103484	commit \| diff
parent	c66d03f1e13e8f1746e063d642480cd951d4ca44	commit \| diff

Merge trunk changes (including fixes for warnings in fts5) with this branch.

FossilOrigin-Name: ceccc9ad788fb4da9120915741995b9f088f85ff

ext/fts5/fts5Int.h	diff1 \|	diff2 \|	blob \| history
manifest	diff1 \|	diff2 \|	blob \| history
manifest.uuid	diff1 \|	diff2 \|	blob \| history

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