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: 33c1eb6 0539702)

author	drh <drh@noemail.net>
	Fri, 5 Feb 2016 14:15:34 +0000 (14:15 +0000)
committer	drh <drh@noemail.net>
	Fri, 5 Feb 2016 14:15:34 +0000 (14:15 +0000)
commit	0ac7cfaf9971681079f6e9d7ab4f7f2b2f376546
tree	1d545d99bb6eac2e377e894a275770afff9b1a3d	tree \| snapshot
parent	33c1eb64772caf48a33d92e1a3c5a577c9ba1aa9	commit \| diff
parent	0539702b8e9a54b2c8cbc28db6666570700fc1c8	commit \| diff

Merge enhancements from trunk.

FossilOrigin-Name: a533608cb0de3cbc1e28a794aab99864b8c249f4

14 files changed:

manifest	diff1 \|	diff2 \|	blob \| history
manifest.uuid	diff1 \|	diff2 \|	blob \| history
src/delete.c	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/update.c	diff1 \|	diff2 \|	blob \| history
src/vdbe.c	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/permutations.test	diff1 \|	diff2 \|	blob \| history
test/tester.tcl	diff1 \|	diff2 \|	blob \| history

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