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: 62c831d b9626cf)

author	drh <drh@noemail.net>
	Mon, 22 Feb 2016 16:32:39 +0000 (16:32 +0000)
committer	drh <drh@noemail.net>
	Mon, 22 Feb 2016 16:32:39 +0000 (16:32 +0000)
commit	4f25847dbda8be7b517460710d543a060754e62b
tree	f300132e4fcb72c82adbbe8d279f47af613309af	tree \| snapshot
parent	62c831d829570f968268dddff25cbb650ae86513	commit \| diff
parent	b9626cfa709ff5f71521035d21efd79b781bb760	commit \| diff

Merge the master-journal optimization and other recent changes from trunk.

FossilOrigin-Name: 18c3ab4784a4efab2cc583ef712c4db9d127418a

manifest	diff1 \|	diff2 \|	blob \| history
manifest.uuid	diff1 \|	diff2 \|	blob \| history
src/main.c	diff1 \|	diff2 \|	blob \| history
src/test1.c	diff1 \|	diff2 \|	blob \| history
src/vdbe.c	diff1 \|	diff2 \|	blob \| history
test/pager1.test	diff1 \|	diff2 \|	blob \| history

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