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: afd6cf1 5c3aa05)

author	drh <drh@noemail.net>
	Wed, 20 Jan 2016 11:40:31 +0000 (11:40 +0000)
committer	drh <drh@noemail.net>
	Wed, 20 Jan 2016 11:40:31 +0000 (11:40 +0000)
commit	e2fe1a59b792ecc914f353a08f4656f3b150578b
tree	7677c46b03eacba77598918f70f0f923faa26202	tree \| snapshot
parent	afd6cf1041ebc9e91f276e892a61f2baa20ddd84	commit \| diff
parent	5c3aa0517ed8a837e4d70cacbaca5d9e267e0fc3	commit \| diff

Merge all recent enhancements from trunk.

FossilOrigin-Name: 3ed49691a12455e8583d8b8394ab005124442e89

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

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