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: 3e6bc39 0699f29)

author	drh <drh@noemail.net>
	Fri, 30 Jan 2015 16:36:17 +0000 (16:36 +0000)
committer	drh <drh@noemail.net>
	Fri, 30 Jan 2015 16:36:17 +0000 (16:36 +0000)
commit	3102aa01fdb0e48502e2f66c27fad3df3a7bc1e4
tree	d39dad74962802466e9c9672ff2348d280adcfdb	tree \| snapshot
parent	3e6bc3977f8c879e997259ef3c8582e2f4f493b3	commit \| diff
parent	0699f29a14f0cd013092a04789ee14f53fc5ed9f	commit \| diff

Merge all recent trunk changes, and especially the SQLITE_TESTCTRL_INITMODE
enhancement.

FossilOrigin-Name: 36436dde74ce2536a9a430b4458216499ad113bf

ext/ota/ota2.test	diff1 \|	\|	blob \| history
manifest	diff1 \|	diff2 \|	blob \| history
manifest.uuid	diff1 \|	diff2 \|	blob \| history
src/main.c	diff1 \|	diff2 \|	blob \| history
src/sqlite.h.in	diff1 \|	diff2 \|	blob \| history
src/test1.c	diff1 \|	diff2 \|	blob \| history
src/wal.c	diff1 \|	diff2 \|	blob \| history

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