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: dcb1a84 2e7be08)

author	dan <dan@noemail.net>
	Fri, 9 May 2014 15:00:32 +0000 (15:00 +0000)
committer	dan <dan@noemail.net>
	Fri, 9 May 2014 15:00:32 +0000 (15:00 +0000)
commit	ae289fccbf6efae693d12ada717a72c5298c0923
tree	e12272c157fffa35107463b21343e752a3455e04	tree \| snapshot
parent	dcb1a840ff101edd3b3d7388aba431fcf733d68e	commit \| diff
parent	2e7be081526084a73bee5ebe778bc83904b87de3	commit \| diff

Merge the latest trunk changes into the threads branch.

FossilOrigin-Name: 9ac8f1e7115bc50663235adedeb0d3e1234c5740

12 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/mutex_w32.c	diff1 \|	diff2 \|	blob \| history
src/os_win.c	diff1 \|	diff2 \|	blob \| history
src/sqlite.h.in	diff1 \|	diff2 \|	blob \| history
src/test1.c	diff1 \|	diff2 \|	blob \| history
src/test_config.c	diff1 \|	diff2 \|	blob \| history
tool/mksqlite3c-noext.tcl	diff1 \|	diff2 \|	blob \| history
tool/mksqlite3c.tcl	diff1 \|	diff2 \|	blob \| history

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