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: 5898ad6 aca55cf)

author	drh <drh@noemail.net>
	Thu, 11 Jun 2015 18:01:29 +0000 (18:01 +0000)
committer	drh <drh@noemail.net>
	Thu, 11 Jun 2015 18:01:29 +0000 (18:01 +0000)
commit	60c97e6aa88b96277a4f8e6ba7d9ebd83f956cc3
tree	7f45413e8c324d75eb0ed1016b4e7e1c06d4313b	tree \| snapshot
parent	5898ad69543124bd762d91b341401c704cfd1099	commit \| diff
parent	aca55cfec3c5261ffe48f0485c2c08fb36fdae1d	commit \| diff

Merge recent trunk enhancements and fixes.

FossilOrigin-Name: c39cb0e2571f58c87053de009e2c135d71b2c3af

14 files changed:

Makefile.in	diff1 \|	diff2 \|	blob \| history
Makefile.msc	diff1 \|	diff2 \|	blob \| history
main.mk	diff1 \|	diff2 \|	blob \| history
manifest	diff1 \|	diff2 \|	blob \| history
manifest.uuid	diff1 \|	diff2 \|	blob \| history
src/delete.c	diff1 \|	diff2 \|	blob \| history
src/insert.c	diff1 \|	diff2 \|	blob \| history
src/sqlite.h.in	diff1 \|	diff2 \|	blob \| history
src/sqliteInt.h	diff1 \|	diff2 \|	blob \| history
src/vdbe.c	diff1 \|	diff2 \|	blob \| history
src/vdbemem.c	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