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: e7106be eb7df46)

author	drh <drh@noemail.net>
	Mon, 4 Jun 2018 14:10:15 +0000 (14:10 +0000)
committer	drh <drh@noemail.net>
	Mon, 4 Jun 2018 14:10:15 +0000 (14:10 +0000)
commit	55cb77270b89ef2bf0c5bc63d089f28c80d3dc37
tree	0102f8adbd5c1c01f9707d05d97e7b9d9505cb65	tree \| snapshot
parent	e7106be82ca589c5c17c4a46d6b8854c2a2a4425	commit \| diff
parent	eb7df46e3203bb1fe1cfbd1c42c3af1a26a6ce6d	commit \| diff

Merge changes from trunk.

FossilOrigin-Name: 95fbac39baaab1c3a84fdfc82ccb7f42398b2e92f18a2a57bce1d4a713cb0839

ext/rtree/rtree.c	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/os_unix.c	diff1 \|	diff2 \|	blob \| history
src/pragma.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/vdbeapi.c	diff1 \|	diff2 \|	blob \| history

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