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: 7904588 b463fef)

author	drh <drh@noemail.net>
	Thu, 29 May 2014 20:24:20 +0000 (20:24 +0000)
committer	drh <drh@noemail.net>
	Thu, 29 May 2014 20:24:20 +0000 (20:24 +0000)
commit	ff14013496b17cb697d34b21574a9898a38bbd2c
tree	10d8dc7da780b6dd056f1943cb4abc527436f882	tree \| snapshot
parent	79045882c94a21ddb2c2f829d0a515266555f527	commit \| diff
parent	b463fef3fda4d233ba634d81bfc9c3bf001f0513	commit \| diff

Merge changes from the trunk into the threads branch.

FossilOrigin-Name: 416cb091267de91b9cadee9f7453b8627570b7d3

manifest	diff1 \|	diff2 \|	blob \| history
manifest.uuid	diff1 \|	diff2 \|	blob \| history
src/btree.c	diff1 \|	diff2 \|	blob \| history
src/build.c	diff1 \|	diff2 \|	blob \| history
src/os_win.c	diff1 \|	diff2 \|	blob \| history
src/select.c	diff1 \|	diff2 \|	blob \| history
src/shell.c	diff1 \|	diff2 \|	blob \| history
src/sqliteInt.h	diff1 \|	diff2 \|	blob \| history
src/vdbe.c	diff1 \|	diff2 \|	blob \| history
src/vdbesort.c	diff1 \|	diff2 \|	blob \| history

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