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: 38f9402 58cca03)

author	drh <drh@noemail.net>
	Tue, 16 Dec 2014 00:29:06 +0000 (00:29 +0000)
committer	drh <drh@noemail.net>
	Tue, 16 Dec 2014 00:29:06 +0000 (00:29 +0000)
commit	79e319ef93cb4a26f2162b4bf76e928b862b0481
tree	9da1a83f136c9ba00bb6168cc450504b8d7188ee	tree \| snapshot
parent	38f940254aa18c3b771130f2a2bc922112cd870a	commit \| diff
parent	58cca03ce5312c5b7048b44051cfdf9eebf20ec0	commit \| diff

Merge latest fixes and enhancements from trunk into apple-osx.

FossilOrigin-Name: 2c1d8ddab23b36dbdd30ff82401925f97ffc5d76

14 files changed:

main.mk	diff1 \|	diff2 \|	blob \| history
manifest	diff1 \|	diff2 \|	blob \| history
manifest.uuid	diff1 \|	diff2 \|	blob \| history
src/btree.c	diff1 \|	diff2 \|	blob \| history
src/main.c	diff1 \|	diff2 \|	blob \| history
src/os_win.c	diff1 \|	diff2 \|	blob \| history
src/pragma.c	diff1 \|	diff2 \|	blob \| history
src/prepare.c	diff1 \|	diff2 \|	blob \| history
src/sqlite.h.in	diff1 \|	diff2 \|	blob \| history
src/sqliteInt.h	diff1 \|	diff2 \|	blob \| history
src/test1.c	diff1 \|	diff2 \|	blob \| history
src/vdbeapi.c	diff1 \|	diff2 \|	blob \| history
test/lock5.test	diff1 \|	diff2 \|	blob \| history
test/pragma.test	diff1 \|	diff2 \|	blob \| history

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