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: fd0b436 fe201ef)

author	dan <dan@noemail.net>
	Wed, 21 Jan 2015 06:36:07 +0000 (06:36 +0000)
committer	dan <dan@noemail.net>
	Wed, 21 Jan 2015 06:36:07 +0000 (06:36 +0000)
commit	997d798d92a7f9bc72fa29174bc83d8c4cc5618d
tree	acbb3dba2e2b1000463eb801cdedb1f3261e6fd2	tree \| snapshot
parent	fd0b436e1044867a5788c58d79c3a7976aa46874	commit \| diff
parent	fe201effbe35d38fdd198be93b23abe7583b2aa9	commit \| diff

Merge latest trunk changes with this branch.

FossilOrigin-Name: b3348b1e07e168b156636a29fc8c6d6afb3129c2

ext/fts5/test/fts5aa.test	diff1 \|	\|	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/tclsqlite.c	diff1 \|	diff2 \|	blob \| history
src/test_config.c	diff1 \|	diff2 \|	blob \| history
test/permutations.test	diff1 \|	diff2 \|	blob \| history
tool/mksqlite3c.tcl	diff1 \|	diff2 \|	blob \| history

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