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: ff53032 75e7bc1)

author	drh <drh@noemail.net>
	Fri, 22 Jul 2011 12:49:27 +0000 (12:49 +0000)
committer	drh <drh@noemail.net>
	Fri, 22 Jul 2011 12:49:27 +0000 (12:49 +0000)
commit	8a3bb3fddd85f113cdc6e0cea297fcbc31be0876
tree	5231ec83bc56ca52a33345e5bb19565239da1091	tree \| snapshot
parent	ff53032641c6a9e01b3e9c8425c3a101fd7f7546	commit \| diff
parent	75e7bc1db7027404e65841b2da934324a3dc5dbd	commit \| diff

Merge the latest trunk changes into the sessions branch.

FossilOrigin-Name: 110cfd6920cf3011aeaf7e586f8db867bfc69fbb

13 files changed:

main.mk	diff1 \|	diff2 \|	blob \| history
manifest	diff1 \|	diff2 \|	blob \| history
manifest.uuid	diff1 \|	diff2 \|	blob \| history
src/delete.c	diff1 \|	diff2 \|	blob \| history
src/sqlite.h.in	diff1 \|	diff2 \|	blob \| history
src/sqliteInt.h	diff1 \|	diff2 \|	blob \| history
src/tclsqlite.c	diff1 \|	diff2 \|	blob \| history
src/test_config.c	diff1 \|	diff2 \|	blob \| history
src/update.c	diff1 \|	diff2 \|	blob \| history
src/vdbe.c	diff1 \|	diff2 \|	blob \| history
src/vdbeapi.c	diff1 \|	diff2 \|	blob \| history
src/vdbeaux.c	diff1 \|	diff2 \|	blob \| history
test/permutations.test	diff1 \|	diff2 \|	blob \| history

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