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: c1b7fdd 2dd93c8)

author	dan <dan@noemail.net>
	Fri, 28 Sep 2018 21:11:12 +0000 (21:11 +0000)
committer	dan <dan@noemail.net>
	Fri, 28 Sep 2018 21:11:12 +0000 (21:11 +0000)
commit	0131a914d3e95bf84c6d4958ab9d7625792bad80
tree	ed130e66448f7a1e9c5536bbf794bb3bdf3957ff	tree \| snapshot
parent	c1b7fdd43e6a09a528f4cec254537a655fb50112	commit \| diff
parent	2dd93c8838b375641ec3404021472c9591ed6762	commit \| diff

Merge latest begin-concurrent changes into this branch.

FossilOrigin-Name: 6f3dd9809fdef7d6195f1f93428a662d5a8c01dba9815daa22d1b94059a2eb43

manifest	diff1 \|	diff2 \|	blob \| history
manifest.uuid	diff1 \|	diff2 \|	blob \| history
src/btree.c	diff1 \|	diff2 \|	blob \| history
src/pragma.h	diff1 \|	diff2 \|	blob \| history
src/sqliteInt.h	diff1 \|	diff2 \|	blob \| history
src/update.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