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: 5a3d6b1 1fd2d7d)

author	drh <drh@noemail.net>
	Tue, 2 Dec 2014 16:38:43 +0000 (16:38 +0000)
committer	drh <drh@noemail.net>
	Tue, 2 Dec 2014 16:38:43 +0000 (16:38 +0000)
commit	6f34c36a397b84f9d4d88e1e6115fd0d98484410
tree	ef0f122a555242635158807be8ce497c25830210	tree \| snapshot
parent	5a3d6b1a3920dd7f2fcd40044b74653981022d2d	commit \| diff
parent	1fd2d7d4715695d09bf7120c6a335e5806e8418d	commit \| diff

Merge all recent enhancements and bug fixes from trunk into the apple-osx
branch.

FossilOrigin-Name: 43c4ba26a20ca0230d898a6431ed9ae5cfdb63d3

13 files changed:

manifest	diff1 \|	diff2 \|	blob \| history
manifest.uuid	diff1 \|	diff2 \|	blob \| history
src/btree.c	diff1 \|	diff2 \|	blob \| history
src/func.c	diff1 \|	diff2 \|	blob \| history
src/main.c	diff1 \|	diff2 \|	blob \| history
src/pager.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/vdbe.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

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