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: 3f73784 983b5ee)

author	drh <drh@noemail.net>
	Fri, 13 Feb 2015 12:13:43 +0000 (12:13 +0000)
committer	drh <drh@noemail.net>
	Fri, 13 Feb 2015 12:13:43 +0000 (12:13 +0000)
commit	b8963868c92fb612e6d98daff099fdcf8ab0d050
tree	856de760a1f09fd42b0a34231466bd2730672b22	tree \| snapshot
parent	3f73784941431a7572031540cc02e8dc3008b825	commit \| diff
parent	983b5ee73df642d1bfe5a1fcf61219c1608aec88	commit \| diff

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

FossilOrigin-Name: b2449d67768f4d3d83877d9c45e5b4b17bb6a551

manifest	diff1 \|	diff2 \|	blob \| history
manifest.uuid	diff1 \|	diff2 \|	blob \| history
src/select.c	diff1 \|	diff2 \|	blob \| history
src/sqliteInt.h	diff1 \|	diff2 \|	blob \| history
src/vdbeapi.c	diff1 \|	diff2 \|	blob \| history

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