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: 1ee4a2d 2da47d3)

author	drh <drh@noemail.net>
	Sat, 21 Feb 2015 15:13:50 +0000 (15:13 +0000)
committer	drh <drh@noemail.net>
	Sat, 21 Feb 2015 15:13:50 +0000 (15:13 +0000)
commit	878acb32efa879e0b680cce08f63e65f89fa4f77
tree	84f334c6f75c248e10f9a92c17e3dae631f2c597	tree \| snapshot
parent	1ee4a2dd88663517c8dd980926af9e76f37c88fb	commit \| diff
parent	2da47d38691b74a6cfa2ce2e5bdce3bb7d8fc186	commit \| diff

Merge all recent trunk changes into the sessions branch.

FossilOrigin-Name: f36bb5fa5c5e3430808fe35d58f45559a216d341

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/shell.c	diff1 \|	diff2 \|	blob \| history
src/sqlite.h.in	diff1 \|	diff2 \|	blob \| history
src/sqliteInt.h	diff1 \|	diff2 \|	blob \| history
src/vdbeInt.h	diff1 \|	diff2 \|	blob \| history
src/vdbeapi.c	diff1 \|	diff2 \|	blob \| history
src/vdbeblob.c	diff1 \|	diff2 \|	blob \| history

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