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: 9c54156 83bebdd)

author	drh <drh@noemail.net>
	Mon, 28 Aug 2017 17:19:35 +0000 (17:19 +0000)
committer	drh <drh@noemail.net>
	Mon, 28 Aug 2017 17:19:35 +0000 (17:19 +0000)
commit	b25057c2912c52c2b2e17b6639a65c853e0297ee
tree	a18e6e2b45d9ddfd62aae06d3809bc14ff6f7b4e	tree
parent	9c54156a9cc203a106f9938eab1a572c7f3598f3	commit \| diff
parent	83bebddbd91ea60568aa4be7c268e25b8a179e82	commit \| diff

Merge recent enhancements from trunk.

FossilOrigin-Name: d53108e76307fb24ef1d8f75fe82c180f5588ad8e65eeceace92f4cecadfa452

16 files changed:

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/btree.h	diff1 \|	diff2 \|	blob \| history
src/btreeInt.h	diff1 \|	diff2 \|	blob \| history
src/build.c	diff1 \|	diff2 \|	blob \| history
src/main.c	diff1 \|	diff2 \|	blob \| history
src/pager.c	diff1 \|	diff2 \|	blob \| history
src/sqlite.h.in	diff1 \|	diff2 \|	blob \| history
src/sqliteInt.h	diff1 \|	diff2 \|	blob \| history
src/vdbe.c	diff1 \|	diff2 \|	blob \| history
src/vdbeaux.c	diff1 \|	diff2 \|	blob \| history
src/wal.c	diff1 \|	diff2 \|	blob \| history
src/wal.h	diff1 \|	diff2 \|	blob \| history
test/wal2.test	diff1 \|	diff2 \|	blob \| history

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