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

author	drh <drh@noemail.net>
	Mon, 26 May 2014 20:15:21 +0000 (20:15 +0000)
committer	drh <drh@noemail.net>
	Mon, 26 May 2014 20:15:21 +0000 (20:15 +0000)
commit	79045882c94a21ddb2c2f829d0a515266555f527
tree	4fffcd542040ca062299eb8228960cd8fff24661	tree \| snapshot
parent	cb6effafecd4bbd73a55002e4df081c2e687451b	commit \| diff
parent	6a8ac852aaed7a50f3c68b66e229dd7028893503	commit \| diff

Merge recent trunk changes into the threads branch.

FossilOrigin-Name: 8215202759dbd863edf20aa26ff21da20bc35d73

manifest	diff1 \|	diff2 \|	blob \| history
manifest.uuid	diff1 \|	diff2 \|	blob \| history
src/btree.c	diff1 \|	diff2 \|	blob \| history
src/build.c	diff1 \|	diff2 \|	blob \| history
src/main.c	diff1 \|	diff2 \|	blob \| history
src/select.c	diff1 \|	diff2 \|	blob \| history
src/shell.c	diff1 \|	diff2 \|	blob \| history
src/vdbe.c	diff1 \|	diff2 \|	blob \| history

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