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: b09945e 3c22c60)

author	drh <drh@noemail.net>
	Tue, 21 Jun 2011 01:30:53 +0000 (01:30 +0000)
committer	drh <drh@noemail.net>
	Tue, 21 Jun 2011 01:30:53 +0000 (01:30 +0000)
commit	fbea85d6cddaf0994ddbfae421350403d89d0d96
tree	b51250c0bd046cfc5ab7c6d6c251098037c9ab91	tree \| snapshot
parent	b09945e64c605b6edce5c84afa9fd480f679fc32	commit \| diff
parent	3c22c604344462ab2cd3fa0be9a4ce4e101eb0b2	commit \| diff

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

FossilOrigin-Name: 76005fdca05d86f91e424698d86942264419c616

ext/rtree/rtree.c	diff1 \|	diff2 \|	blob \| history
manifest	diff1 \|	diff2 \|	blob \| history
manifest.uuid	diff1 \|	diff2 \|	blob \| history
src/os_unix.c	diff1 \|	diff2 \|	blob \| history
src/test_config.c	diff1 \|	diff2 \|	blob \| history
src/vdbe.c	diff1 \|	diff2 \|	blob \| history
test/tester.tcl	diff1 \|	diff2 \|	blob \| history
tool/mksqlite3c.tcl	diff1 \|	diff2 \|	blob \| history

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