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: e5a0604 10df23f)

author	drh <drh@noemail.net>
	Tue, 29 Mar 2016 10:30:24 +0000 (10:30 +0000)
committer	drh <drh@noemail.net>
	Tue, 29 Mar 2016 10:30:24 +0000 (10:30 +0000)
commit	101f557a236334db469e1d8da6140e46b4819bed
tree	7b4740f336dd970e8f69440bd18d9768c764c60e	tree \| snapshot
parent	e5a060474aa6d06e88736fcac91af1234a0f8964	commit \| diff
parent	10df23fe4f73a8eb1bd820f22b6e65e3bcbfd09d	commit \| diff

Merge 3.12.0 changes.

FossilOrigin-Name: eef557449cf665aa8deb85674b7db167b389776a

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_unix.c	diff1 \|	diff2 \|	blob \| history
src/os_win.c	diff1 \|	diff2 \|	blob \| history
src/pragma.c	diff1 \|	diff2 \|	blob \| history
src/sqliteInt.h	diff1 \|	diff2 \|	blob \| history
src/vdbe.c	diff1 \|	diff2 \|	blob \| history
test/memsubsys1.test	diff1 \|	diff2 \|	blob \| history

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