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: e2fe1a5 b8db549)

author	drh <drh@noemail.net>
	Tue, 2 Feb 2016 02:30:01 +0000 (02:30 +0000)
committer	drh <drh@noemail.net>
	Tue, 2 Feb 2016 02:30:01 +0000 (02:30 +0000)
commit	26bb3b2148ded1219d90192c6ac3c29493a3f779
tree	becaa2c18bac2114e156f1bc9d635e567e3979af	tree \| snapshot
parent	e2fe1a59b792ecc914f353a08f4656f3b150578b	commit \| diff
parent	b8db549832d2acc2fc30327e6fb5c0474820f122	commit \| diff

Merge recent enhancements from trunk.

FossilOrigin-Name: e6a4a16312bf71ed5f277cdcd326003eb2580e72

16 files changed:

Makefile.in	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/os_unix.c	diff1 \|	diff2 \|	blob \| history
src/os_win.c	diff1 \|	diff2 \|	blob \| history
src/pager.c	diff1 \|	diff2 \|	blob \| history
src/pragma.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/vdbe.c	diff1 \|	diff2 \|	blob \| history
src/vdbeapi.c	diff1 \|	diff2 \|	blob \| history
test/stat.test	diff1 \|	diff2 \|	blob \| history
test/walcrash.test	diff1 \|	diff2 \|	blob \| history

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