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: cb02671 5e9825e)

author	dan <dan@noemail.net>
	Fri, 2 Mar 2018 17:40:23 +0000 (17:40 +0000)
committer	dan <dan@noemail.net>
	Fri, 2 Mar 2018 17:40:23 +0000 (17:40 +0000)
commit	699bd8121ee3c8996bf9c390dccf6f68c2ffaea1
tree	c6c5b119fc9f6ad54924e42239be7088cfba21fc	tree \| snapshot
parent	cb0267185c8178ad94b9dc169a2ee043ec60321e	commit \| diff
parent	5e9825ecc4cbafa141c3993c249a381b4b3240df	commit \| diff

Merge latest trunk changes into this branch.

FossilOrigin-Name: 36801effa9ec67b551f58972e21794466420f10cd0420701fcd87695e6cd11ee

23 files changed:

ext/session/sqlite3session.c	diff1 \|	diff2 \|	blob \| history
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/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/os_unix.c	diff1 \|	diff2 \|	blob \| history
src/pager.c	diff1 \|	diff2 \|	blob \| history
src/parse.y	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/test_config.c	diff1 \|	diff2 \|	blob \| history
src/vacuum.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
test/wal2.test	diff1 \|	diff2 \|	blob \| history
tool/addopcodes.tcl	diff1 \|	diff2 \|	blob \| history

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