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: aff0fbb b463fef)

author	drh <drh@noemail.net>
	Thu, 29 May 2014 20:29:13 +0000 (20:29 +0000)
committer	drh <drh@noemail.net>
	Thu, 29 May 2014 20:29:13 +0000 (20:29 +0000)
commit	cbabb203908dc97166f2c5fe9366e134fdaf1ed2
tree	5cc34fc60adfff789aa59dc771b02e9440c0ec1e	tree \| snapshot
parent	aff0fbb6a51b2ad8a5e1d7787236226603380437	commit \| diff
parent	b463fef3fda4d233ba634d81bfc9c3bf001f0513	commit \| diff

Merge trunk changes into the sessions branch.

FossilOrigin-Name: 9f18e78f039ffa89a8806810ad385bdc51bc88ed

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

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