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: 74a7ef7 c14566a)

author	drh <drh@noemail.net>
	Wed, 15 Jun 2016 10:21:06 +0000 (10:21 +0000)
committer	drh <drh@noemail.net>
	Wed, 15 Jun 2016 10:21:06 +0000 (10:21 +0000)
commit	9d32b7b042f4cdba70c9b9aa765e034a22579fd5
tree	9a75c7933c9d67b247401417ad8e25eb978ebb3f	tree \| snapshot
parent	74a7ef79f7c4376138eb7c788f6568a848afd150	commit \| diff
parent	c14566aff3cdd0cb0a6acf0e6526a3238b9bbd0c	commit \| diff

Merge changes from trunk.

FossilOrigin-Name: 0f707d1532d6c8277cf0f70821a83e0af621ce9b

15 files changed:

Makefile.in	diff1 \|	diff2 \|	blob \| history
ext/rtree/rtree.c	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/os_win.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/test1.c	diff1 \|	diff2 \|	blob \| history
src/vdbe.c	diff1 \|	diff2 \|	blob \| history
src/vdbeapi.c	diff1 \|	diff2 \|	blob \| history
src/wal.c	diff1 \|	diff2 \|	blob \| history
test/ctime.test	diff1 \|	diff2 \|	blob \| history

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