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: b13cc88 ccf46d0)

author	drh <drh@noemail.net>
	Wed, 1 Apr 2015 16:13:35 +0000 (16:13 +0000)
committer	drh <drh@noemail.net>
	Wed, 1 Apr 2015 16:13:35 +0000 (16:13 +0000)
commit	471a717ccb7bf4f0fb10c5a41d571a181784cd44
tree	4ef714b0f0845416df4c94b176b8cced177ef31f	tree \| snapshot
parent	b13cc88cd3cd0c58d22bf74080ba584525eb5bce	commit \| diff
parent	ccf46d0b9020d88fddbdc2dd9b9104b403f7d615	commit \| diff

Merge all recent trunk fixes and enhancements into the apple-osx branch.

FossilOrigin-Name: 71b6f507f1c5feb897b8162c468ecf2547a3d50e

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_win.c	diff1 \|	diff2 \|	blob \| history
src/vdbe.c	diff1 \|	diff2 \|	blob \| history
test/attach.test	diff1 \|	diff2 \|	blob \| history

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