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: f60f004 e3d511c)

author	drh <drh@noemail.net>
	Fri, 4 May 2018 19:33:34 +0000 (19:33 +0000)
committer	drh <drh@noemail.net>
	Fri, 4 May 2018 19:33:34 +0000 (19:33 +0000)
commit	01b37173f7e2dec4bae7196ad3a7ebda2fc16146
tree	93ede9320084bf98d377a562e0afdc1bbc21ccef	tree
parent	f60f004961aa199a0afc5f5d3df6e2793fd05867	commit \| diff
parent	e3d511c078ecf3ccc2e2fcd945e0a2bd3616220b	commit \| diff

Merge recent enhancements from trunk.

FossilOrigin-Name: e17bca2cdb5f31a802e1a1870deb6bf17e332117ab272537f26351f1145de690

14 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/btree.c	diff1 \|	diff2 \|	blob \| history
src/main.c	diff1 \|	diff2 \|	blob \| history
src/os_win.c	diff1 \|	diff2 \|	blob \| history
src/prepare.c	diff1 \|	diff2 \|	blob \| history
src/sqlite.h.in	diff1 \|	diff2 \|	blob \| history
src/sqliteInt.h	diff1 \|	diff2 \|	blob \| history
src/test1.c	diff1 \|	diff2 \|	blob \| history
test/tester.tcl	diff1 \|	diff2 \|	blob \| history
tool/mksqlite3c.tcl	diff1 \|	diff2 \|	blob \| history

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