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: 4690775 6831474)

author	drh <drh@noemail.net>
	Mon, 23 May 2016 02:57:33 +0000 (02:57 +0000)
committer	drh <drh@noemail.net>
	Mon, 23 May 2016 02:57:33 +0000 (02:57 +0000)
commit	74a7ef79f7c4376138eb7c788f6568a848afd150
tree	a2acf5bd8ffd696609e44e6d5ba67e7202f21b84	tree \| snapshot
parent	469077596ffedfa2b528537807b80eb06840ff4a	commit \| diff
parent	6831474341d6f532246158a59ed289e15424098a	commit \| diff

Merge changes from trunk.

FossilOrigin-Name: 815cc2bb48db713a0166b82a55ae931ac43783d1

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/pager.c	diff1 \|	diff2 \|	blob \| history
src/pager.h	diff1 \|	diff2 \|	blob \| history
src/pragma.c	diff1 \|	diff2 \|	blob \| history
src/sqliteInt.h	diff1 \|	diff2 \|	blob \| history
src/vdbe.c	diff1 \|	diff2 \|	blob \| history

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