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: 5a5ced7 6568ffb)

author	drh <drh@noemail.net>
	Tue, 7 Dec 2010 15:49:03 +0000 (15:49 +0000)
committer	drh <drh@noemail.net>
	Tue, 7 Dec 2010 15:49:03 +0000 (15:49 +0000)
commit	67d225da53e798558f8437f175155149d59c802c
tree	8f4864754ce77aebbc093da9522bcb2474b6171c	tree \| snapshot
parent	5a5ced7da91dc856b25f858f3ff9ed93550b0b98	commit \| diff
parent	6568ffb14f5c5665cc363d66a5fae28f8fcc39ec	commit \| diff

Merge in all changes to the trunk through version 3.7.4rc3.

FossilOrigin-Name: d2ccf7fc0673e875ff7b84cd37b89c65df4bec7f

13 files changed:

Makefile.in	diff1 \|	diff2 \|	blob \| history
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/pragma.c	diff1 \|	diff2 \|	blob \| history
src/prepare.c	diff1 \|	diff2 \|	blob \| history
src/test1.c	diff1 \|	diff2 \|	blob \| history
src/vdbe.c	diff1 \|	diff2 \|	blob \| history
test/malloc_common.tcl	diff1 \|	diff2 \|	blob \| history
test/tester.tcl	diff1 \|	diff2 \|	blob \| history
test/wal2.test	diff1 \|	diff2 \|	blob \| history
test/wal3.test	diff1 \|	diff2 \|	blob \| history

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