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: 04600b2 697c9ea)

author	drh <drh@noemail.net>
	Mon, 16 May 2016 13:37:45 +0000 (13:37 +0000)
committer	drh <drh@noemail.net>
	Mon, 16 May 2016 13:37:45 +0000 (13:37 +0000)
commit	88b69f3fb5c477a3b115214a3b6fe92b4c31d306
tree	227fbe5fa32ba3677d2a68b14be6e8db49effc95	tree
parent	04600b249f2651f17ba6a6851b6cbbb6c3c19c50	commit \| diff
parent	697c9eaa907474554aaaf97ad71f07c2a151c7ac	commit \| diff

Merge recent fixes from trunk.

FossilOrigin-Name: 0d9b82afeadf3d8d8ca2aacd3620717e773ebe30

Makefile.in	diff1 \|	diff2 \|	blob \| history
main.mk	diff1 \|	diff2 \|	blob \| history
manifest	diff1 \|	diff2 \|	blob \| history
manifest.uuid	diff1 \|	diff2 \|	blob \| history
src/btree.c	diff1 \|	diff2 \|	blob \| history
src/pager.c	diff1 \|	diff2 \|	blob \| history
src/sqliteInt.h	diff1 \|	diff2 \|	blob \| history
src/test1.c	diff1 \|	diff2 \|	blob \| history

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