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: c3835e0 6764a70)

author	drh <drh@noemail.net>
	Mon, 20 Jun 2011 11:57:58 +0000 (11:57 +0000)
committer	drh <drh@noemail.net>
	Mon, 20 Jun 2011 11:57:58 +0000 (11:57 +0000)
commit	b09945e64c605b6edce5c84afa9fd480f679fc32
tree	c4c69e98351ccb5eae662185ec24ab639ad53ca5	tree \| snapshot
parent	c3835e0208506fc98420a86ad509fb10b7b8a629	commit \| diff
parent	6764a7008695be030f2475dc34215e9cbce91dc5	commit \| diff

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

FossilOrigin-Name: 4c69e827f4d65e597e125e0d6691b0c8fb5588d7

Makefile.in	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/main.c	diff1 \|	diff2 \|	blob \| history
src/pragma.c	diff1 \|	diff2 \|	blob \| history
src/vdbe.c	diff1 \|	diff2 \|	blob \| history
test/pagerfault.test	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