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: 47e1842 d260dd3)

author	drh <drh@noemail.net>
	Mon, 21 Mar 2016 15:32:19 +0000 (15:32 +0000)
committer	drh <drh@noemail.net>
	Mon, 21 Mar 2016 15:32:19 +0000 (15:32 +0000)
commit	dbf8a16cb3e18b4da9cf2345cd160c98c85afd77
tree	ec5538fdf71f37b607e2565df0cffa6d16ede93c	tree
parent	47e1842e5bd5c5f467b0290f3fde9df69fa42a25	commit \| diff
parent	d260dd3534dea0957e038e69dcb8df47225c9853	commit \| diff

Merge 3.12.0 beta changes from trunk.

FossilOrigin-Name: 3296a0ceedef43c2790f0b36471f91138a575243

manifest	diff1 \|	diff2 \|	blob \| history
manifest.uuid	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/test_config.c	diff1 \|	diff2 \|	blob \| history
src/vdbe.c	diff1 \|	diff2 \|	blob \| history
src/vdbe.h	diff1 \|	diff2 \|	blob \| history
src/vdbeaux.c	diff1 \|	diff2 \|	blob \| history
src/vdbemem.c	diff1 \|	diff2 \|	blob \| history
test/tester.tcl	diff1 \|	diff2 \|	blob \| history

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