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: 738394c d6b7946)

author	drh <drh@noemail.net>
	Sat, 7 Nov 2015 01:57:44 +0000 (01:57 +0000)
committer	drh <drh@noemail.net>
	Sat, 7 Nov 2015 01:57:44 +0000 (01:57 +0000)
commit	961c98618da0d1790b40a528fcb7a7a370618509
tree	f8719ac9b4d90546ba425f0be99e70d43c4645c9	tree \| snapshot
parent	738394c06987d6d13846f5b29c56e3ee6c6e2fbf	commit \| diff
parent	d6b7946c32ec1cf4b77f51ab82db553cf466c488	commit \| diff

Merge recent enhancements and fixes from trunk.

FossilOrigin-Name: 5429f99b98ea1e2ecf5f50dade52009adc431a12

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

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