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: 9a89254 dd1bb43)

author	drh <drh@noemail.net>
	Mon, 15 May 2017 17:34:23 +0000 (17:34 +0000)
committer	drh <drh@noemail.net>
	Mon, 15 May 2017 17:34:23 +0000 (17:34 +0000)
commit	2ecf1ec8c935a729d09b370fce139c463f4e384d
tree	4ebe2099188e088afffeca4cb33c876918966d75	tree \| snapshot
parent	9a89254e7a6821b9419d8d45845cc7ba9f13bd83	commit \| diff
parent	dd1bb43ab53cc8ab624988ec78157e7e6d0e73ff	commit \| diff

Merge the latest changes from trunk.

FossilOrigin-Name: 14ea84003600ada6f4605e47028cb72fe621a14bcce3637ad48b1512dcce41cd

12 files changed:

manifest	diff1 \|	diff2 \|	blob \| history
manifest.uuid	diff1 \|	diff2 \|	blob \| history
src/btree.c	diff1 \|	diff2 \|	blob \| history
src/btree.h	diff1 \|	diff2 \|	blob \| history
src/btreeInt.h	diff1 \|	diff2 \|	blob \| history
src/build.c	diff1 \|	diff2 \|	blob \| history
src/pager.c	diff1 \|	diff2 \|	blob \| history
src/parse.y	diff1 \|	diff2 \|	blob \| history
src/sqliteInt.h	diff1 \|	diff2 \|	blob \| history
src/vdbe.c	diff1 \|	diff2 \|	blob \| history
src/vdbeaux.c	diff1 \|	diff2 \|	blob \| history
tool/addopcodes.tcl	diff1 \|	diff2 \|	blob \| history

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