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: 90defef 52bcde0)

author	drh <drh@noemail.net>
	Tue, 3 Jan 2012 21:54:09 +0000 (21:54 +0000)
committer	drh <drh@noemail.net>
	Tue, 3 Jan 2012 21:54:09 +0000 (21:54 +0000)
commit	39ab1aef892f87afc43fb4855386dddb812acd6b
tree	5992631597900dffa7f8d51b0b0392b42e24ee5a	tree \| snapshot
parent	90defefb85b9845feea191d3a707208b131b0b2f	commit \| diff
parent	52bcde0e2d73c73a16a05b8e6a637b60034e9b48	commit \| diff

Pull all the latest trunk changes over into the apple-osx branch.

FossilOrigin-Name: 8a048423f0e409d2332558cb5148e5a1d251ae30

25 files changed:

ext/rtree/rtree.c	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/mem1.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/select.c	diff1 \|	diff2 \|	blob \| history
src/sqlite.h.in	diff1 \|	diff2 \|	blob \| history
src/sqliteInt.h	diff1 \|	diff2 \|	blob \| history
src/test1.c	diff1 \|	diff2 \|	blob \| history
src/vdbe.c	diff1 \|	diff2 \|	blob \| history
src/vdbeapi.c	diff1 \|	diff2 \|	blob \| history
src/vdbeaux.c	diff1 \|	diff2 \|	blob \| history
src/vdbetrace.c	diff1 \|	diff2 \|	blob \| history
src/wal.c	diff1 \|	diff2 \|	blob \| history
src/wal.h	diff1 \|	diff2 \|	blob \| history
test/incrvacuum2.test	diff1 \|	diff2 \|	blob \| history
test/multiplex.test	diff1 \|	diff2 \|	blob \| history
test/pager1.test	diff1 \|	diff2 \|	blob \| history
test/superlock.test	diff1 \|	diff2 \|	blob \| history
test/wal.test	diff1 \|	diff2 \|	blob \| history

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