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: 03206c4 f526826)

author	drh <drh@noemail.net>
	Mon, 21 Mar 2016 15:54:46 +0000 (15:54 +0000)
committer	drh <drh@noemail.net>
	Mon, 21 Mar 2016 15:54:46 +0000 (15:54 +0000)
commit	99b14894ebf9ed4c847f72dc19668df2fc7b40b3
tree	77525ad40050a794cf197e4d5e9526a16f96bdbb	tree \| snapshot
parent	03206c433c2238d9918251bb9969de2112056056	commit \| diff
parent	f5268268b7d057b7d39454279d80641447b8320b	commit \| diff

Merge all recent changes from trunk.

FossilOrigin-Name: 8ee7d346c1d9beedd02bf11d0a45810985a45480

manifest	diff1 \|	diff2 \|	blob \| history
manifest.uuid	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/vdbeaux.c	diff1 \|	diff2 \|	blob \| history
test/wal2.test	diff1 \|	diff2 \|	blob \| history

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