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: 6614181 ba5b093)

author	drh <drh@noemail.net>
	Thu, 24 Jul 2014 16:54:28 +0000 (16:54 +0000)
committer	drh <drh@noemail.net>
	Thu, 24 Jul 2014 16:54:28 +0000 (16:54 +0000)
commit	2bd2c29a955a2d459b2b300125eda1d79b070e64
tree	3dac35daf7fb3c5a48c4e71900dfcff7b4a95311	tree
parent	6614181610e4c40e44484a1c7b14b253d512ad77	commit \| diff
parent	ba5b09319e2f79707bcc55a84a5f059ea0949334	commit \| diff

Merge all recent trunk changes into the threads branch.

FossilOrigin-Name: 770685892c8f09b9cddb2fbb2877cfb291e19425

14 files changed:

Makefile.in	diff1 \|	diff2 \|	blob \| history
Makefile.msc	diff1 \|	diff2 \|	blob \| history
main.mk	diff1 \|	diff2 \|	blob \| history
manifest	diff1 \|	diff2 \|	blob \| history
manifest.uuid	diff1 \|	diff2 \|	blob \| history
src/build.c	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/test_config.c	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