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: 6024772 a0de826)

author	dan <dan@noemail.net>
	Thu, 1 Jan 2015 18:03:49 +0000 (18:03 +0000)
committer	dan <dan@noemail.net>
	Thu, 1 Jan 2015 18:03:49 +0000 (18:03 +0000)
commit	37db72f1f7ca41c61b1c084bdb75f3111ceba6f8
tree	5a01dcb28b6513353a64e93b11d6243845e69bc7	tree \| snapshot
parent	6024772ba292a9abc6810dd0b12767d02b47ccf1	commit \| diff
parent	a0de826c9ff84bd19de76ebbc0d4bdafa9686d3a	commit \| diff

Merge latest trunk changes with this branch.

FossilOrigin-Name: 4b3651677e7132c4c45605bc1f216fc08ef31198

12 files changed:

ext/fts3/unicode/mkunicode.tcl	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/tclsqlite.c	diff1 \|	diff2 \|	blob \| history
src/test_config.c	diff1 \|	diff2 \|	blob \| history
src/vtab.c	diff1 \|	diff2 \|	blob \| history
test/malloc_common.tcl	diff1 \|	diff2 \|	blob \| history
test/permutations.test	diff1 \|	diff2 \|	blob \| history
test/tester.tcl	diff1 \|	diff2 \|	blob \| history
tool/mksqlite3c.tcl	diff1 \|	diff2 \|	blob \| history

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