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: 81ab269 2fade2f)

author	drh <drh@noemail.net>
	Tue, 9 Feb 2016 15:50:33 +0000 (15:50 +0000)
committer	drh <drh@noemail.net>
	Tue, 9 Feb 2016 15:50:33 +0000 (15:50 +0000)
commit	1158cd750f87e53183c653da779ae4128bf93ccc
tree	fb3684a0853c3baae8996049708cf48b755b11b4	tree \| snapshot
parent	81ab26904bff2485e029d21d1d499ced843af94c	commit \| diff
parent	2fade2f7913f948a6b2ad92e2e0e557de53937fe	commit \| diff

Merge recent fixes and enhancements from trunk.

FossilOrigin-Name: f073401792c0a093d4324fc2636170f108656976

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/main.c	diff1 \|	diff2 \|	blob \| history
src/test_config.c	diff1 \|	diff2 \|	blob \| history
test/wal6.test	diff1 \|	diff2 \|	blob \| history

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