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: 595db25 6e1a037)

author	drh <drh@noemail.net>
	Fri, 10 Oct 2014 12:56:35 +0000 (12:56 +0000)
committer	drh <drh@noemail.net>
	Fri, 10 Oct 2014 12:56:35 +0000 (12:56 +0000)
commit	78aad7cd1d026afa649460cf0ed6508c3d88a16e
tree	c66b7fbf71eff102ec90e35f39473d86e85c8425	tree \| snapshot
parent	595db25b2890e493e978796a439f66925d8a1e3d	commit \| diff
parent	6e1a03735790e1ccf2f243d26197090e7954b9fc	commit \| diff

Merge all recent trunk changes.

FossilOrigin-Name: abfef254721ca29b653f24bfe80e88adaa92dc6c

manifest	diff1 \|	diff2 \|	blob \| history
manifest.uuid	diff1 \|	diff2 \|	blob \| history
src/main.c	diff1 \|	diff2 \|	blob \| history
src/sqlite.h.in	diff1 \|	diff2 \|	blob \| history
src/sqliteInt.h	diff1 \|	diff2 \|	blob \| history
src/test_config.c	diff1 \|	diff2 \|	blob \| history
src/vdbe.c	diff1 \|	diff2 \|	blob \| history
src/vdbeapi.c	diff1 \|	diff2 \|	blob \| history
src/vdbemem.c	diff1 \|	diff2 \|	blob \| history

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