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: 9cc5985 6656630)

author	drh <drh@noemail.net>
	Sun, 21 Sep 2014 23:08:54 +0000 (23:08 +0000)
committer	drh <drh@noemail.net>
	Sun, 21 Sep 2014 23:08:54 +0000 (23:08 +0000)
commit	dde37a1cb09c86f7512bd8140807ce9db42e713e
tree	efa220257fa28cd3505fafd5fe932691f8ac5fff	tree \| snapshot
parent	9cc5985bc48a63d6dbcc70f7823446270aa9563c	commit \| diff
parent	6656630b632fc89ec22860f4100474f5fa194588	commit \| diff

Merge in all recent changes from trunk.

FossilOrigin-Name: 3967ebe83e7cbb1dde26e4c9a6713d5c70fefe46

21 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/func.c	diff1 \|	diff2 \|	blob \| history
src/legacy.c	diff1 \|	diff2 \|	blob \| history
src/main.c	diff1 \|	diff2 \|	blob \| history
src/os_unix.c	diff1 \|	diff2 \|	blob \| history
src/os_win.c	diff1 \|	diff2 \|	blob \| history
src/pager.c	diff1 \|	diff2 \|	blob \| history
src/pragma.c	diff1 \|	diff2 \|	blob \| history
src/prepare.c	diff1 \|	diff2 \|	blob \| history
src/select.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/test_config.c	diff1 \|	diff2 \|	blob \| history
src/vdbe.c	diff1 \|	diff2 \|	blob \| history
src/vdbeapi.c	diff1 \|	diff2 \|	blob \| history
src/vdbeaux.c	diff1 \|	diff2 \|	blob \| history
src/wal.c	diff1 \|	diff2 \|	blob \| history

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