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: cb75bff 5c3aa05)

author	drh <drh@noemail.net>
	Wed, 20 Jan 2016 11:33:37 +0000 (11:33 +0000)
committer	drh <drh@noemail.net>
	Wed, 20 Jan 2016 11:33:37 +0000 (11:33 +0000)
commit	20f272c96f2b67c3a3fa6784dcf14a2d5439791e
tree	7b39797e2f7a70fb8d331904f2a563c522a1aca3	tree \| snapshot
parent	cb75bff3f7fe12fd3d5dd94acd2832ef1e0dcb65	commit \| diff
parent	5c3aa0517ed8a837e4d70cacbaca5d9e267e0fc3	commit \| diff

Merge recent enhancements from trunk.

FossilOrigin-Name: 327af5f644a49b2f41d5456958f9d61a2b704e1c

15 files changed:

Makefile.in	diff1 \|	diff2 \|	blob \| history
Makefile.msc	diff1 \|	diff2 \|	blob \| history
main.mk	diff1 \|	diff2 \|	blob \| history
manifest	diff1 \|	diff2 \|	blob \| history
manifest.uuid	diff1 \|	diff2 \|	blob \| history
src/insert.c	diff1 \|	diff2 \|	blob \| history
src/main.c	diff1 \|	diff2 \|	blob \| history
src/sqliteInt.h	diff1 \|	diff2 \|	blob \| history
src/vdbe.c	diff1 \|	diff2 \|	blob \| history
src/vdbe.h	diff1 \|	diff2 \|	blob \| history
src/vdbeapi.c	diff1 \|	diff2 \|	blob \| history
src/vdbeaux.c	diff1 \|	diff2 \|	blob \| history
src/vdbeblob.c	diff1 \|	diff2 \|	blob \| history
src/vdbemem.c	diff1 \|	diff2 \|	blob \| history
test/hook.test	diff1 \|	diff2 \|	blob \| history

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