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: 618fea4 e74f465)

author	drh <drh@noemail.net>
	Wed, 15 Aug 2012 16:21:55 +0000 (16:21 +0000)
committer	drh <drh@noemail.net>
	Wed, 15 Aug 2012 16:21:55 +0000 (16:21 +0000)
commit	16de7f4d3297a8a197d1e588b64e3bdde9593a2a
tree	7a38b09267984dec9cee3a2c29a8277ab2c5e3f0	tree \| snapshot
parent	618fea4830063e6a24fb4c71d7cd5c680ef7d0ab	commit \| diff
parent	e74f4651da9d37fef98d83b293ed220d2ca6a7e4	commit \| diff

Merge all the latest trunk changes into the sessions branch.

FossilOrigin-Name: fc07a4795e027108674d1d41eb4350df629ddc8b

15 files changed:

Makefile.msc	diff1 \|	diff2 \|	blob \| history
configure	diff1 \|	diff2 \|	blob \| history
main.mk	diff1 \|	diff2 \|	blob \| history
manifest	diff1 \|	diff2 \|	blob \| history
manifest.uuid	diff1 \|	diff2 \|	blob \| history
src/insert.c	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/test_config.c	diff1 \|	diff2 \|	blob \| history
src/vdbe.c	diff1 \|	diff2 \|	blob \| history
src/vdbeInt.h	diff1 \|	diff2 \|	blob \| history
src/vdbeapi.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