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: b25057c 0b11bcb)

author	dan <dan@noemail.net>
	Fri, 22 Sep 2017 10:49:03 +0000 (10:49 +0000)
committer	dan <dan@noemail.net>
	Fri, 22 Sep 2017 10:49:03 +0000 (10:49 +0000)
commit	3eba5d00b66597a847745d3e62cdc94fe8f97773
tree	3a2a6305664ed0b599bb8ffde1abad72693f81ca	tree \| snapshot
parent	b25057c2912c52c2b2e17b6639a65c853e0297ee	commit \| diff
parent	0b11bcb3e468591ae9a980271ae3b9e07a88a4c8	commit \| diff

Merge latest trunk changes into this branch.

FossilOrigin-Name: 307b802e8627c93a51e4c54851a4fab33db5061bb80e3d327ce53b127d6d511b

13 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/build.c	diff1 \|	diff2 \|	blob \| history
src/main.c	diff1 \|	diff2 \|	blob \| history
src/pager.c	diff1 \|	diff2 \|	blob \| history
src/pager.h	diff1 \|	diff2 \|	blob \| history
src/sqlite.h.in	diff1 \|	diff2 \|	blob \| history
src/sqliteInt.h	diff1 \|	diff2 \|	blob \| history
src/test1.c	diff1 \|	diff2 \|	blob \| history
src/vdbe.c	diff1 \|	diff2 \|	blob \| history
src/vdbeaux.c	diff1 \|	diff2 \|	blob \| history

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