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: 5a51c27 c3b4132)

author	dan <dan@noemail.net>
	Mon, 27 Jul 2015 12:19:11 +0000 (12:19 +0000)
committer	dan <dan@noemail.net>
	Mon, 27 Jul 2015 12:19:11 +0000 (12:19 +0000)
commit	291d0909478c72688f7cef95f713009e15b9db65
tree	4599c25a850ac37178a8de6fbcb5169d489aa5d3	tree
parent	5a51c272ea657ba076f289df260a79c9222c8754	commit \| diff
parent	c3b4132f531d49f81fdb2a1e4532ea8fab09db48	commit \| diff

Merge the fts5-btree-index branch with this one. FTS5 changes only.

FossilOrigin-Name: 9f1dcdc3e1644c21762dacf619fac70afe6318c5

ext/fts5/fts5_index.c	diff1 \|	diff2 \|	blob \| history
ext/fts5/test/fts5al.test	diff1 \|	diff2 \|	blob \| history
ext/fts5/test/fts5version.test	diff1 \|	diff2 \|	blob \| history
manifest	diff1 \|	diff2 \|	blob \| history
manifest.uuid	diff1 \|	diff2 \|	blob \| history

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