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: da2e586 4ed2fb9)

author	drh <drh@noemail.net>
	Thu, 14 Aug 2014 14:02:48 +0000 (14:02 +0000)
committer	drh <drh@noemail.net>
	Thu, 14 Aug 2014 14:02:48 +0000 (14:02 +0000)
commit	83b25d32d7ca274011455f1e5a9db2db1c49f8e9
tree	c613bbcfb25a01bc6e5045f1ef5c246d622b1c3a	tree \| snapshot
parent	da2e5862d13e2db2d00c353d12a2f471d6dc77b0	commit \| diff
parent	4ed2fb9d84bdc76c3085c0e8baf80a53d8d57d10	commit \| diff

Merge the pre-3.8.6 changes into the threads branch.

FossilOrigin-Name: a608fd1d52606a009c3acc7f1d184b86a7df3c82

manifest	diff1 \|	diff2 \|	blob \| history
manifest.uuid	diff1 \|	diff2 \|	blob \| history
src/main.c	diff1 \|	diff2 \|	blob \| history
src/os_win.c	diff1 \|	diff2 \|	blob \| history
src/select.c	diff1 \|	diff2 \|	blob \| history
src/shell.c	diff1 \|	diff2 \|	blob \| history
src/sqlite.h.in	diff1 \|	diff2 \|	blob \| history
src/vdbe.c	diff1 \|	diff2 \|	blob \| history
src/vdbeaux.c	diff1 \|	diff2 \|	blob \| history
test/malloc.test	diff1 \|	diff2 \|	blob \| history

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