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: 60c97e6 bbe031f)

author	drh <drh@noemail.net>
	Wed, 17 Jun 2015 18:18:51 +0000 (18:18 +0000)
committer	drh <drh@noemail.net>
	Wed, 17 Jun 2015 18:18:51 +0000 (18:18 +0000)
commit	5600329bc033aa5837969918d3397e455ee93d51
tree	258ab0590848adbbf5e278c2d3e26b803d5dede2	tree \| snapshot
parent	60c97e6aa88b96277a4f8e6ba7d9ebd83f956cc3	commit \| diff
parent	bbe031f9f1260fd97622cfd47dbdf5377daee6b2	commit \| diff

Merge all recent enhancements and fixes from trunk.

FossilOrigin-Name: 199bfb67fdf642cca6cd5d460fa4dc602b94837a

manifest	diff1 \|	diff2 \|	blob \| history
manifest.uuid	diff1 \|	diff2 \|	blob \| history
src/main.c	diff1 \|	diff2 \|	blob \| history
src/shell.c	diff1 \|	diff2 \|	blob \| history
src/sqlite.h.in	diff1 \|	diff2 \|	blob \| history
src/sqliteInt.h	diff1 \|	diff2 \|	blob \| history
src/vdbe.c	diff1 \|	diff2 \|	blob \| history
src/vdbe.h	diff1 \|	diff2 \|	blob \| history
src/vdbeInt.h	diff1 \|	diff2 \|	blob \| history
src/vdbeaux.c	diff1 \|	diff2 \|	blob \| history
src/vdbemem.c	diff1 \|	diff2 \|	blob \| history

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