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: d8b7200 968067d)

author	drh <drh@noemail.net>
	Fri, 16 Dec 2016 16:49:11 +0000 (16:49 +0000)
committer	drh <drh@noemail.net>
	Fri, 16 Dec 2016 16:49:11 +0000 (16:49 +0000)
commit	3cbb1995f364ac9644a08240726c8f8913e931cd
tree	ca5cd0d6f698ea93f8154474d23eb456f9469e8d	tree
parent	d8b7200b84e379723a695527aaa4fb7818b541bd	commit \| diff
parent	968067d28299a5bd43ed5af0016227602ee5185d	commit \| diff

Experimental merge of the est_count_pragma and the pragma-as-vtab branches.

FossilOrigin-Name: 4b73ee33f31281886256663a0e4a6397d3c8efc5

manifest	diff1 \|	diff2 \|	blob \| history
manifest.uuid	diff1 \|	diff2 \|	blob \| history
src/build.c	diff1 \|	diff2 \|	blob \| history
src/pragma.c	diff1 \|	diff2 \|	blob \| history
src/pragma.h	diff1 \|	diff2 \|	blob \| history
src/sqliteInt.h	diff1 \|	diff2 \|	blob \| history
tool/mkpragmatab.tcl	diff1 \|	diff2 \|	blob \| history

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