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: d963982 6a8ac85)

author	drh <drh@noemail.net>
	Mon, 26 May 2014 20:00:00 +0000 (20:00 +0000)
committer	drh <drh@noemail.net>
	Mon, 26 May 2014 20:00:00 +0000 (20:00 +0000)
commit	aff0fbb6a51b2ad8a5e1d7787236226603380437
tree	d31d166d7b6a6b168579d3cb2ae1e7720dd9b996	tree
parent	d96398204927b5b177cb1ae900ba65353ada9399	commit \| diff
parent	6a8ac852aaed7a50f3c68b66e229dd7028893503	commit \| diff

Merge recent trunk changes into the sessions branch.

FossilOrigin-Name: a769c7e03e6d4163986d49652687de34d15906a0

manifest	diff1 \|	diff2 \|	blob \| history
manifest.uuid	diff1 \|	diff2 \|	blob \| history
src/insert.c	diff1 \|	diff2 \|	blob \| history
src/main.c	diff1 \|	diff2 \|	blob \| history
src/vdbe.c	diff1 \|	diff2 \|	blob \| history

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