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: 2da1504 0895117)

author	dan <dan@noemail.net>
	Wed, 29 Nov 2017 16:16:29 +0000 (16:16 +0000)
committer	dan <dan@noemail.net>
	Wed, 29 Nov 2017 16:16:29 +0000 (16:16 +0000)
commit	3d9c7c3a4f5854770cf834f4d53d4c76be35696e
tree	50cc4114262bb2650d409537ac8e0bb4ecd7cb1d	tree \| snapshot
parent	2da1504432a7e0efb4ccd119db29eb3dea2d6ad8	commit \| diff
parent	0895117512bd461ac97f432f20a2dbd91095e1d5	commit \| diff

Merge latest trunk changes into this branch.

FossilOrigin-Name: 373fa21bffd37053bb1a741d3ace2f003a5639bf373c20ea7bb24a31080888b3

12 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/main.c	diff1 \|	diff2 \|	blob \| history
src/sqlite.h.in	diff1 \|	diff2 \|	blob \| history
src/sqliteInt.h	diff1 \|	diff2 \|	blob \| history
src/test_tclsh.c	\|	diff2 \|	blob \| history
src/vdbeaux.c	diff1 \|	diff2 \|	blob \| history
src/where.c	diff1 \|	diff2 \|	blob \| history
test/permutations.test	diff1 \|	diff2 \|	blob \| history

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