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

author	drh <drh@noemail.net>
	Thu, 29 May 2014 20:36:56 +0000 (20:36 +0000)
committer	drh <drh@noemail.net>
	Thu, 29 May 2014 20:36:56 +0000 (20:36 +0000)
commit	acf5e9d69261ffda41333f76a30f7ea63e3489b5
tree	2e6ced030bef6aed75ca68181be2f23f44f9dd49	tree \| snapshot
parent	ef39ae556cdea1d4e2beb568476077d1a4b36ee9	commit \| diff
parent	b463fef3fda4d233ba634d81bfc9c3bf001f0513	commit \| diff

Merge trunk changes into the apple-osx branch.

FossilOrigin-Name: b9fad4490c437a2c49cf86cc1c068433d6d2866b

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

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