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: 5d5a49d 64b600f)

author	drh <drh@noemail.net>
	Tue, 18 Nov 2014 21:27:48 +0000 (21:27 +0000)
committer	drh <drh@noemail.net>
	Tue, 18 Nov 2014 21:27:48 +0000 (21:27 +0000)
commit	5a3d6b1a3920dd7f2fcd40044b74653981022d2d
tree	e184518c1721404e1e322da8f3dd112192ed8173	tree \| snapshot
parent	5d5a49d8da3d3a82e738b035dcd5873974678cbd	commit \| diff
parent	64b600ff13d4bac1d459cf54b649b45e520aba4c	commit \| diff

Merge recent trunk enhancements.

FossilOrigin-Name: ccb601f6dffba68a57d82db2d046aa27f6f1b755

15 files changed:

Makefile.in	diff1 \|	diff2 \|	blob \| history
main.mk	diff1 \|	diff2 \|	blob \| history
manifest	diff1 \|	diff2 \|	blob \| history
manifest.uuid	diff1 \|	diff2 \|	blob \| history
src/btree.c	diff1 \|	diff2 \|	blob \| history
src/main.c	diff1 \|	diff2 \|	blob \| history
src/os_win.c	diff1 \|	diff2 \|	blob \| history
src/sqlite.h.in	diff1 \|	diff2 \|	blob \| history
src/sqliteInt.h	diff1 \|	diff2 \|	blob \| history
src/test1.c	diff1 \|	diff2 \|	blob \| history
src/test_config.c	diff1 \|	diff2 \|	blob \| history
src/vdbe.c	diff1 \|	diff2 \|	blob \| history
src/vdbeapi.c	diff1 \|	diff2 \|	blob \| history
src/vdbeaux.c	diff1 \|	diff2 \|	blob \| history
src/wal.c	diff1 \|	diff2 \|	blob \| history

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