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: 8885708 b4e0fd2)

author	dan <dan@noemail.net>
	Sat, 21 Mar 2015 15:45:24 +0000 (15:45 +0000)
committer	dan <dan@noemail.net>
	Sat, 21 Mar 2015 15:45:24 +0000 (15:45 +0000)
commit	71138b0f0fe7746b685d2cafb6ce821d1a1dd69b
tree	702071165ccf40e4a1728080fcfb262369e0e57e	tree \| snapshot
parent	8885708c3ceebe9f7b7f7851faf1ca3c998b0f2e	commit \| diff
parent	b4e0fd26e3fad8124dd51a1ee1dc6e6286eff5a0	commit \| diff

Merge trunk changes with this branch.

FossilOrigin-Name: 142743918fd5a6d79fa10c44398360c3684a255a

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/test_config.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