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: 9d32b7b 422dded)

author	drh <drh@noemail.net>
	Mon, 25 Jul 2016 17:31:24 +0000 (17:31 +0000)
committer	drh <drh@noemail.net>
	Mon, 25 Jul 2016 17:31:24 +0000 (17:31 +0000)
commit	ebbee40a8fa2f41f458a183cdf8748cba5046c69
tree	98583a726b7df3f740a9afd1d0085534a0d1a9e1	tree \| snapshot
parent	9d32b7b042f4cdba70c9b9aa765e034a22579fd5	commit \| diff
parent	422dded5a9f9fe9aa26da20c5565be903609a83f	commit \| diff

Merge 3.14 alpha changes from trunk.

FossilOrigin-Name: e98cefb17d03ca146d0ff42bdd4dd6a8f3ba6735

17 files changed:

Makefile.in	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/main.c	diff1 \|	diff2 \|	blob \| history
src/os.c	diff1 \|	diff2 \|	blob \| history
src/os_win.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/vdbeapi.c	diff1 \|	diff2 \|	blob \| history
src/wal.h	diff1 \|	diff2 \|	blob \| history
test/ctime.test	diff1 \|	diff2 \|	blob \| history
test/tester.tcl	diff1 \|	diff2 \|	blob \| history

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