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: 23d5388 13a24f8)

author	dan <dan@noemail.net>
	Wed, 13 May 2015 18:12:58 +0000 (18:12 +0000)
committer	dan <dan@noemail.net>
	Wed, 13 May 2015 18:12:58 +0000 (18:12 +0000)
commit	5d03b9d36592cf22cc53bd4dbe9ffbdfc4949545
tree	668bd7b85f1a66b6ac2f5fca5483dbf514439e01	tree \| snapshot
parent	23d538885eb5b4db3056f0cce47004248bf1949f	commit \| diff
parent	13a24f841c86f6e8c64c9ceb1dcce8eb89e162ac	commit \| diff

Merge latest trunk changes with this branch.

FossilOrigin-Name: b5f0e8c5b4bc018d672617ffd342d12b228548b9

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/tclsqlite.c	diff1 \|	diff2 \|	blob \| history
src/vtab.c	diff1 \|	diff2 \|	blob \| history
tool/mksqlite3c.tcl	diff1 \|	diff2 \|	blob \| history

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