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: 35c3d8c 57ff60b)

author	drh <drh@noemail.net>
	Tue, 29 Jul 2014 12:40:45 +0000 (12:40 +0000)
committer	drh <drh@noemail.net>
	Tue, 29 Jul 2014 12:40:45 +0000 (12:40 +0000)
commit	aae73527ad2a6b50211a758b7cbc8013173ffe00
tree	6d8775160e6cdf825f4972732ded753289f17cd6	tree \| snapshot
parent	35c3d8cc75623d1fe890c8aaaaabb174e5de8d23	commit \| diff
parent	57ff60b19b7596ad8259694d77f7861a314a5189	commit \| diff

Merge recent trunk changes, and especially the fix for the R-Tree problem
described in ticket [d2889096e7bdeac6].

FossilOrigin-Name: 8f1beeade0ddf802900c9d203a4fd678d1190394

manifest	diff1 \|	diff2 \|	blob \| history
manifest.uuid	diff1 \|	diff2 \|	blob \| history
src/sqliteInt.h	diff1 \|	diff2 \|	blob \| history
src/vdbe.c	diff1 \|	diff2 \|	blob \| history
src/vdbeInt.h	diff1 \|	diff2 \|	blob \| history
src/vdbeaux.c	diff1 \|	diff2 \|	blob \| history

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