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: c8d985e 3312348)

author	drh <drh@noemail.net>
	Tue, 24 Dec 2013 12:09:42 +0000 (12:09 +0000)
committer	drh <drh@noemail.net>
	Tue, 24 Dec 2013 12:09:42 +0000 (12:09 +0000)
commit	d9e3c267b469a4cefa99fc2ec2273eed9810c86e
tree	e00f35398deedb65ae1add14b0dcb8033f6d860d	tree \| snapshot
parent	c8d985e09c2adc83a944889bd6e60e4e86864e3e	commit \| diff
parent	3312348cf8d88eb170825aa7b52254ea6219ff4b	commit \| diff

Merge the latest trunk changes into the sessions branch.

FossilOrigin-Name: cfd110bf5db2c1993a5e2ca718648bd9c17ee22c

14 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/insert.c	diff1 \|	diff2 \|	blob \| history
src/main.c	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/vdbeaux.c	diff1 \|	diff2 \|	blob \| history
src/vdbeblob.c	diff1 \|	diff2 \|	blob \| history

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