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: fa64665 ef45bb7)

author	drh <drh@noemail.net>
	Thu, 5 May 2011 15:52:46 +0000 (15:52 +0000)
committer	drh <drh@noemail.net>
	Thu, 5 May 2011 15:52:46 +0000 (15:52 +0000)
commit	283f9e7ee6b0356778222a780ee8893b35fb3ab9
tree	aa7fd8bb254081ff1de25d67f7d7d2f1001e37ed	tree \| snapshot
parent	fa64665a49c3a1082fbd907e8b1005adf3727bfb	commit \| diff
parent	ef45bb75b305bcd231c069c84a9761660e7243b8	commit \| diff

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

FossilOrigin-Name: f9b149e53815235aaf92f722e37c4819503d72b3

ext/rtree/rtree.c	diff1 \|	diff2 \|	blob \| history
main.mk	diff1 \|	diff2 \|	blob \| history
manifest	diff1 \|	diff2 \|	blob \| history
manifest.uuid	diff1 \|	diff2 \|	blob \| history
src/func.c	diff1 \|	diff2 \|	blob \| history
src/os_unix.c	diff1 \|	diff2 \|	blob \| history
src/test1.c	diff1 \|	diff2 \|	blob \| history
src/vdbe.c	diff1 \|	diff2 \|	blob \| history
test/tester.tcl	diff1 \|	diff2 \|	blob \| history
test/wal2.test	diff1 \|	diff2 \|	blob \| history

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