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: bf0ed47 d80138a)

author	drh <drh@noemail.net>
	Mon, 20 Jun 2011 10:44:10 +0000 (10:44 +0000)
committer	drh <drh@noemail.net>
	Mon, 20 Jun 2011 10:44:10 +0000 (10:44 +0000)
commit	8863f35f5ca84317c5eb43ff2c40906b2bb6dc54
tree	6ac30e1228b07e16cbde3d74c9ca39c2839b68d2	tree \| snapshot
parent	bf0ed47d82328aa2517e99d60b56b4c95cad17cd	commit \| diff
parent	d80138af2c42ea2f1cd9627823281f6b1e20525e	commit \| diff

Merge the latest trunk changes into the sessions branch.

FossilOrigin-Name: 4c5e276c902e0b93cfc05bf2e1db966ecdac0ed0

17 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/main.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/update.c	diff1 \|	diff2 \|	blob \| history
src/vdbe.c	diff1 \|	diff2 \|	blob \| history
src/vdbe.h	diff1 \|	diff2 \|	blob \| history
src/vdbeInt.h	diff1 \|	diff2 \|	blob \| history
src/vdbeapi.c	diff1 \|	diff2 \|	blob \| history
src/vdbeaux.c	diff1 \|	diff2 \|	blob \| history
test/hook.test	diff1 \|	diff2 \|	blob \| history
test/permutations.test	diff1 \|	diff2 \|	blob \| history
test/tester.tcl	diff1 \|	diff2 \|	blob \| history

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