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: 9827122 22c733d)

author	drh <drh@noemail.net>
	Thu, 24 Sep 2015 14:43:42 +0000 (14:43 +0000)
committer	drh <drh@noemail.net>
	Thu, 24 Sep 2015 14:43:42 +0000 (14:43 +0000)
commit	7c5113fc3b9dc0ab2f3319d0ea63ed967c0204b2
tree	4dc9a3014a895920b708876609dd5b0f746e3b3f	tree \| snapshot
parent	9827122af5eefa7574a91dbda08be10f787b322a	commit \| diff
parent	22c733da644bcf8d614b7caf058c7a2b51286ab8	commit \| diff

Merge recent trunk enhancements into the apple-osx branch.

FossilOrigin-Name: 4dd06d8ba1548552a4fc781207efda810cf34e55

12 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/pager.h	diff1 \|	diff2 \|	blob \| history
src/sqlite.h.in	diff1 \|	diff2 \|	blob \| history
src/vdbeapi.c	diff1 \|	diff2 \|	blob \| history
test/wal3.test	diff1 \|	diff2 \|	blob \| history

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