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: e616735 a8519d7)

author	drh <drh@noemail.net>
	Wed, 24 Jan 2018 15:02:53 +0000 (15:02 +0000)
committer	drh <drh@noemail.net>
	Wed, 24 Jan 2018 15:02:53 +0000 (15:02 +0000)
commit	31a13548f837c2f95947b9e692b4c683a8e825a1
tree	2ec3c5d1fc44a87c78746ae4486fa22b882f1fef	tree
parent	e616735cb190447097b83af23734dafd9fcda548	commit \| diff
parent	a8519d79b953b4249de75781d11f0cf4aafb57a1	commit \| diff

Merge changes from trunk.

FossilOrigin-Name: 6ef3de810d54563c227045b16197b8011ce285ea867261946f93b2de55344f29

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/pager.c	diff1 \|	diff2 \|	blob \| history
src/sqlite.h.in	diff1 \|	diff2 \|	blob \| history
src/sqliteInt.h	diff1 \|	diff2 \|	blob \| history
src/tclsqlite.c	diff1 \|	diff2 \|	blob \| history

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