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: 8f0dab3 c007f61)

author	drh <drh@noemail.net>
	Fri, 16 May 2014 14:27:05 +0000 (14:27 +0000)
committer	drh <drh@noemail.net>
	Fri, 16 May 2014 14:27:05 +0000 (14:27 +0000)
commit	d25c69ef3996946e5faba5ca5547e68ae805ef0e
tree	de5b6f6bd29510b4ecf10a0a16fb9c15e8b90d0b	tree \| snapshot
parent	8f0dab37cb6800ade1d73386009cc8384240c6bb	commit \| diff
parent	c007f61bb02c2f20a3a240daeb0f2c88d68df85e	commit \| diff

Merge all recent changes from trunk, and especially the new sqlite3FaultSim()
interface.

FossilOrigin-Name: 43fcbd9116401f30781fdcbe55d1674d6b96311b

Makefile.msc	diff1 \|	diff2 \|	blob \| history
manifest	diff1 \|	diff2 \|	blob \| history
manifest.uuid	diff1 \|	diff2 \|	blob \| history
src/global.c	diff1 \|	diff2 \|	blob \| history
src/main.c	diff1 \|	diff2 \|	blob \| history
src/mutex_w32.c	diff1 \|	diff2 \|	blob \| history
src/sqliteInt.h	diff1 \|	diff2 \|	blob \| history

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