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: c0fea3c bc5cf38)

author	drh <drh@noemail.net>
	Wed, 6 Aug 2014 02:03:35 +0000 (02:03 +0000)
committer	drh <drh@noemail.net>
	Wed, 6 Aug 2014 02:03:35 +0000 (02:03 +0000)
commit	da2e5862d13e2db2d00c353d12a2f471d6dc77b0
tree	221279d76d0ba6f197fc98f1086ae523ee7d7862	tree \| snapshot
parent	c0fea3cf53015606fbc1725937fd0b74fc523112	commit \| diff
parent	bc5cf3813ea1bf56ed19a35028061e779827fffc	commit \| diff

Merge all recent changes from trunk.

FossilOrigin-Name: a353a8515fb2eff86042d0c33e39772f4d04e0b3

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

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