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: e8c1a64 b496a8f)

author	drh <drh@noemail.net>
	Mon, 20 Apr 2015 01:25:56 +0000 (01:25 +0000)
committer	drh <drh@noemail.net>
	Mon, 20 Apr 2015 01:25:56 +0000 (01:25 +0000)
commit	3fa3114310489bd87e3dfdcfbf53d5fb12597e7d
tree	d80362d1d9547de2dc30c9aa311cb5fa1aef710f	tree \| snapshot
parent	e8c1a641b112760bf9976935de7b75f600d69bd8	commit \| diff
parent	b496a8f547853a12c02d16cd4cfb100a3ee5ba70	commit \| diff

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

FossilOrigin-Name: 74b7bf17446bc21a73fa5b75c2942b5660b0ad7e

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/pragma.c	diff1 \|	diff2 \|	blob \| history
src/prepare.c	diff1 \|	diff2 \|	blob \| history
src/select.c	diff1 \|	diff2 \|	blob \| history
src/sqliteInt.h	diff1 \|	diff2 \|	blob \| history
src/vdbe.c	diff1 \|	diff2 \|	blob \| history
src/vdbeaux.c	diff1 \|	diff2 \|	blob \| history
test/pragma.test	diff1 \|	diff2 \|	blob \| history

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