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: 343811c 25d054f)

author	drh <drh@noemail.net>
	Fri, 26 Aug 2011 19:18:50 +0000 (19:18 +0000)
committer	drh <drh@noemail.net>
	Fri, 26 Aug 2011 19:18:50 +0000 (19:18 +0000)
commit	253df3a264cb6eaf125c009399aac52ea37d6d66
tree	bdde2b719f8e2e9f9412e7ff6ec9a99d694487d3	tree \| snapshot
parent	343811ce134c519ff92a5847618a5aa083ceeaf4	commit \| diff
parent	25d054fabd9e54d7c13a9fcfcfc7346472e3f6db	commit \| diff

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

FossilOrigin-Name: 55af80035f0432bbd4c4b3f4dbc9def13c5356b3

12 files changed:

main.mk	diff1 \|	diff2 \|	blob \| history
manifest	diff1 \|	diff2 \|	blob \| history
manifest.uuid	diff1 \|	diff2 \|	blob \| history
src/btree.c	diff1 \|	diff2 \|	blob \| history
src/main.c	diff1 \|	diff2 \|	blob \| history
src/os_unix.c	diff1 \|	diff2 \|	blob \| history
src/pager.c	diff1 \|	diff2 \|	blob \| history
src/sqlite.h.in	diff1 \|	diff2 \|	blob \| history
src/sqliteInt.h	diff1 \|	diff2 \|	blob \| history
src/test_rtree.c	diff1 \|	diff2 \|	blob \| history
src/vdbe.c	diff1 \|	diff2 \|	blob \| history
test/pager1.test	diff1 \|	diff2 \|	blob \| history

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