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: a3b2856 0e55db1)

author	drh <drh@noemail.net>
	Fri, 6 Feb 2015 16:03:44 +0000 (16:03 +0000)
committer	drh <drh@noemail.net>
	Fri, 6 Feb 2015 16:03:44 +0000 (16:03 +0000)
commit	77cb4f3bf533919af59665f5d8b2442cf5f83f18
tree	1e7b202512080174e4047ae60c593272d6981858	tree \| snapshot
parent	a3b2856ca5c1e820997413544223a67fcf72fcff	commit \| diff
parent	0e55db1cd8748942e3284eb94e774d825ff223fb	commit \| diff

Merge all recent trunk enhancements into the apple-osx branch.

FossilOrigin-Name: 44711921fea2bb2d804d57b23872ab84156a04ba

17 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/pragma.c	diff1 \|	diff2 \|	blob \| history
src/select.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/vdbeaux.c	diff1 \|	diff2 \|	blob \| history
src/wal.c	diff1 \|	diff2 \|	blob \| history
test/pragma.test	diff1 \|	diff2 \|	blob \| history
test/wal5.test	diff1 \|	diff2 \|	blob \| history
tool/mksqlite3c.tcl	diff1 \|	diff2 \|	blob \| history

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