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: c0f69fc 12f84e5)

author	dan <dan@noemail.net>
	Mon, 6 Nov 2017 20:02:08 +0000 (20:02 +0000)
committer	dan <dan@noemail.net>
	Mon, 6 Nov 2017 20:02:08 +0000 (20:02 +0000)
commit	8706485d1a6042d893dcf752ddf06b347efc7282
tree	64bae2049072612cf978d9984a52030e5755765a	tree \| snapshot
parent	c0f69fcec77830092331cc4bbc0b6b36d17a5e7a	commit \| diff
parent	12f84e5ee55145c7427d071ed5afb2188e5c4ef3	commit \| diff

Merge latest trunk changes into this branch.

FossilOrigin-Name: 7f217edab4575554f657d38e2a1bc6b3f577998fdbecb04eb200aeb8b8406581

15 files changed:

ext/session/sqlite3session.h	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/build.c	diff1 \|	diff2 \|	blob \| history
src/main.c	diff1 \|	diff2 \|	blob \| history
src/os_unix.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
src/test_config.c	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

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