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: 76ff069 0ea94db)

author	dan <dan@noemail.net>
	Thu, 14 Jan 2016 15:46:31 +0000 (15:46 +0000)
committer	dan <dan@noemail.net>
	Thu, 14 Jan 2016 15:46:31 +0000 (15:46 +0000)
commit	f687ba597f0015480c97555efe40d4c5626bb745
tree	09322b2e14b35d65762e4edc6e2a79e41e8943be	tree \| snapshot
parent	76ff0699bbb08b0b7a7db25b1db41968fb6a8833	commit \| diff
parent	0ea94db612e0f2348b45dafcedf21d9a8f68c60b	commit \| diff

Merge the latest enhancements and fixes from trunk.

FossilOrigin-Name: fccc5f20c360fa17c3692a9f1fc1d16612632a7f

14 files changed:

manifest	diff1 \|	diff2 \|	blob \| history
manifest.uuid	diff1 \|	diff2 \|	blob \| history
src/btree.c	diff1 \|	diff2 \|	blob \| history
src/btree.h	diff1 \|	diff2 \|	blob \| history
src/btreeInt.h	diff1 \|	diff2 \|	blob \| history
src/build.c	diff1 \|	diff2 \|	blob \| history
src/pager.c	diff1 \|	diff2 \|	blob \| history
src/pager.h	diff1 \|	diff2 \|	blob \| history
src/parse.y	diff1 \|	diff2 \|	blob \| history
src/sqliteInt.h	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
src/wal.h	diff1 \|	diff2 \|	blob \| history

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