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: aa09d05 f9b22ca)

author	drh <drh@noemail.net>
	Fri, 21 Oct 2011 17:18:20 +0000 (17:18 +0000)
committer	drh <drh@noemail.net>
	Fri, 21 Oct 2011 17:18:20 +0000 (17:18 +0000)
commit	7d59b89dc975f48b02b9a1c9e8f28327475acaa2
tree	a9df16704dc2277f45272d08d88479786d1c93c8	tree \| snapshot
parent	aa09d0503dce1c427f393db3fb1d2c780213e7df	commit \| diff
parent	f9b22ca4164e29b5ed0ae27894792b04abd87516	commit \| diff

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

FossilOrigin-Name: be62ef058bcee55b31127ee779f7ecbf762986f8

20 files changed:

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/backup.c	diff1 \|	diff2 \|	blob \| history
src/btree.c	diff1 \|	diff2 \|	blob \| history
src/func.c	diff1 \|	diff2 \|	blob \| history
src/main.c	diff1 \|	diff2 \|	blob \| history
src/os.c	diff1 \|	diff2 \|	blob \| history
src/os_unix.c	diff1 \|	diff2 \|	blob \| history
src/os_win.c	diff1 \|	diff2 \|	blob \| history
src/pager.c	diff1 \|	diff2 \|	blob \| history
src/pragma.c	diff1 \|	diff2 \|	blob \| history
src/select.c	diff1 \|	diff2 \|	blob \| history
src/sqlite.h.in	diff1 \|	diff2 \|	blob \| history
src/sqliteInt.h	diff1 \|	diff2 \|	blob \| history
src/vdbe.c	diff1 \|	diff2 \|	blob \| history
src/vdbeaux.c	diff1 \|	diff2 \|	blob \| history
src/wal.c	diff1 \|	diff2 \|	blob \| history
test/pragma.test	diff1 \|	diff2 \|	blob \| history

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