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: fdf1795 3a1abde)

author	drh <drh@noemail.net>
	Mon, 5 Mar 2012 16:26:00 +0000 (16:26 +0000)
committer	drh <drh@noemail.net>
	Mon, 5 Mar 2012 16:26:00 +0000 (16:26 +0000)
commit	ddf01aeb164e0cb93d3ecdb010605ad6c9cfd6b8
tree	7d38f856497a6562047003cc53afc7870155e0b6	tree \| snapshot
parent	fdf1795618cd8c5f07f5059d9bd146032b8be02e	commit \| diff
parent	3a1abde7c86d00cf84dbec16c24256fb7f91724d	commit \| diff

Merge in the latest trunk changes.

FossilOrigin-Name: ff86875ca35e04cea6c3d5e1b5117a4f227a6b15

Makefile.msc	diff1 \|	diff2 \|	blob \| history
manifest	diff1 \|	diff2 \|	blob \| history
manifest.uuid	diff1 \|	diff2 \|	blob \| history
src/main.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
test/permutations.test	diff1 \|	diff2 \|	blob \| history

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