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: 6af090c 885f410)

author	dan <dan@noemail.net>
	Wed, 19 Jul 2017 18:54:21 +0000 (18:54 +0000)
committer	dan <dan@noemail.net>
	Wed, 19 Jul 2017 18:54:21 +0000 (18:54 +0000)
commit	11584e6779e172de67d48309895dc7d6e5fec60a
tree	d7e6333069fe627c218010661d261676e7f0480a	tree \| snapshot
parent	6af090cc056e61c28508f1ab9144bbbd672c0a64	commit \| diff
parent	885f410472a33c7c9c18895df1b299c8fe2707ba	commit \| diff

Merge latest trunk changes with this branch.

FossilOrigin-Name: be0df0a65fc781fde6e94c9370b4819c703d3b270c707dd59e587a2a6f36c9f4

12 files changed:

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/parse.y	diff1 \|	diff2 \|	blob \| history
src/pragma.c	diff1 \|	diff2 \|	blob \| history
src/pragma.h	diff1 \|	diff2 \|	blob \| history
src/sqlite.h.in	diff1 \|	diff2 \|	blob \| history
src/sqliteInt.h	diff1 \|	diff2 \|	blob \| history
src/vdbeaux.c	diff1 \|	diff2 \|	blob \| history
test/permutations.test	diff1 \|	diff2 \|	blob \| history
tool/mkpragmatab.tcl	diff1 \|	diff2 \|	blob \| history

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