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: 25d2380 fcd71b6)

author	drh <drh@noemail.net>
	Tue, 5 Apr 2011 22:10:50 +0000 (22:10 +0000)
committer	drh <drh@noemail.net>
	Tue, 5 Apr 2011 22:10:50 +0000 (22:10 +0000)
commit	5be1b1f262938dde9ee46820884b666ef2fe2a1a
tree	ffb6fefd39a9306f16ea4d541e272d6de29de0b6	tree \| snapshot
parent	25d2380356c2f3f4cbb48c208ca36d4699197ab8	commit \| diff
parent	fcd71b6010ef105b61f18de5a579024174356172	commit \| diff

Merge the latest trunk changes into the apple-osx branch.

FossilOrigin-Name: c77a767cbd22354d9f6d5cef0d81ea721be593c7

ext/rtree/rtree.c	diff1 \|	diff2 \|	blob \| history
manifest	diff1 \|	diff2 \|	blob \| history
manifest.uuid	diff1 \|	diff2 \|	blob \| history
src/main.c	diff1 \|	diff2 \|	blob \| history
src/vdbe.c	diff1 \|	diff2 \|	blob \| history
src/vdbeapi.c	diff1 \|	diff2 \|	blob \| history
test/wal.test	diff1 \|	diff2 \|	blob \| history

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