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: 6f7fe3e 7b94e7f)

author	drh <drh@noemail.net>
	Mon, 4 Apr 2011 13:11:07 +0000 (13:11 +0000)
committer	drh <drh@noemail.net>
	Mon, 4 Apr 2011 13:11:07 +0000 (13:11 +0000)
commit	69d67f5412ef6e32a66700b997496736f89b60c8
tree	1b3a449878f9937adac0ab52d7468fdcad3e6699	tree \| snapshot
parent	6f7fe3ef3e6961eb92018bc47132260a2835a0ac	commit \| diff
parent	7b94e7f8382b0a29b12e3ee2427331d41a6a0061	commit \| diff

Merge in the latest changes from trunk.

FossilOrigin-Name: 6d78a25ddce75f63581be60c34dbc75f34c243df

22 files changed:

Makefile.in	diff1 \|	diff2 \|	blob \| history
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/func.c	diff1 \|	diff2 \|	blob \| history
src/main.c	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/test_config.c	diff1 \|	diff2 \|	blob \| history
src/vdbe.c	diff1 \|	diff2 \|	blob \| history
src/vdbeapi.c	diff1 \|	diff2 \|	blob \| history
test/attach.test	diff1 \|	diff2 \|	blob \| history
test/malloc_common.tcl	diff1 \|	diff2 \|	blob \| history
test/memdb.test	diff1 \|	diff2 \|	blob \| history
test/wal.test	diff1 \|	diff2 \|	blob \| history
test/wal2.test	diff1 \|	diff2 \|	blob \| history
test/wal3.test	diff1 \|	diff2 \|	blob \| history
test/walfault.test	diff1 \|	diff2 \|	blob \| history
tool/mksqlite3c.tcl	diff1 \|	diff2 \|	blob \| history

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