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: 94c67ec d93b2b8)

author	dan <dan@noemail.net>
	Wed, 9 Mar 2016 08:08:51 +0000 (08:08 +0000)
committer	dan <dan@noemail.net>
	Wed, 9 Mar 2016 08:08:51 +0000 (08:08 +0000)
commit	85a18faff92b3440f47abcb232e9d0e19eb2a1db
tree	76e233f2f4c1a4085e0415743633cbeec5d2ca31	tree
parent	94c67eca890b703f6f14218553adc89d4781ac95	commit \| diff
parent	d93b2b840d916442bd0b3655788a4571e7adba5f	commit \| diff

Merge latest trunk changes with this branch.

FossilOrigin-Name: 59caca4387e97231834a3bffdbed8636be4e8e19

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/pragma.c	diff1 \|	diff2 \|	blob \| history
src/shell.c	diff1 \|	diff2 \|	blob \| history
src/sqlite.h.in	diff1 \|	diff2 \|	blob \| history
src/sqliteInt.h	diff1 \|	diff2 \|	blob \| history
src/where.c	diff1 \|	diff2 \|	blob \| history

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