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: 5969c65 076e85f)

author	drh <drh@noemail.net>
	Thu, 3 Sep 2015 14:48:25 +0000 (14:48 +0000)
committer	drh <drh@noemail.net>
	Thu, 3 Sep 2015 14:48:25 +0000 (14:48 +0000)
commit	6b868817881426f8bc5ecb8e6dbd4c5b06c5e8c4
tree	7678bf2f17c447afed800e0c01787906c14f6447	tree \| snapshot
parent	5969c657ae173726edb908086726f57ee93009df	commit \| diff
parent	076e85f59ce4b477ff6b979596515769e69c41aa	commit \| diff

Merge recent trunk enhancements.

FossilOrigin-Name: 6a513c05850949900f396c7a61accb97cc6d2af5

manifest	diff1 \|	diff2 \|	blob \| history
manifest.uuid	diff1 \|	diff2 \|	blob \| history
src/delete.c	diff1 \|	diff2 \|	blob \| history
src/insert.c	diff1 \|	diff2 \|	blob \| history
src/update.c	diff1 \|	diff2 \|	blob \| history
src/vdbe.h	diff1 \|	diff2 \|	blob \| history
src/vdbeaux.c	diff1 \|	diff2 \|	blob \| history

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