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: f257b4c ba5b093)

author	drh <drh@noemail.net>
	Thu, 24 Jul 2014 16:23:51 +0000 (16:23 +0000)
committer	drh <drh@noemail.net>
	Thu, 24 Jul 2014 16:23:51 +0000 (16:23 +0000)
commit	35c3d8cc75623d1fe890c8aaaaabb174e5de8d23
tree	2e2cfdc5e4f43a0595f60d7b92f546a88d13366e	tree \| snapshot
parent	f257b4c61332fc7d64ad870e912338d0f31ef027	commit \| diff
parent	ba5b09319e2f79707bcc55a84a5f059ea0949334	commit \| diff

Merge recent trunk changes into the sessions branch.

FossilOrigin-Name: a9db017eabdefafcda87c497e8bafa07002ac0fe

13 files changed:

Makefile.in	diff1 \|	diff2 \|	blob \| history
Makefile.msc	diff1 \|	diff2 \|	blob \| history
main.mk	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/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

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