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: 557437f 6bca651)

author	drh <drh@noemail.net>
	Mon, 13 Apr 2015 23:11:45 +0000 (23:11 +0000)
committer	drh <drh@noemail.net>
	Mon, 13 Apr 2015 23:11:45 +0000 (23:11 +0000)
commit	05a43c305f804d086a82244ed40b92a99b8f972d
tree	5d7cee7da34da4e2d7a4ccd249bc07b5063079e7	tree \| snapshot
parent	557437fd510dde07e9e127913b2492f59fb4c35e	commit \| diff
parent	6bca6511666674870a081f05eec9f708ac1ce072	commit \| diff

Merge all recent trunk enhances into the apple-osx branch.

FossilOrigin-Name: e709d3b4e7b91331f58ed8319f98790cfb190cb1

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/os_unix.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
src/vdbeaux.c	diff1 \|	diff2 \|	blob \| history
src/wal.c	diff1 \|	diff2 \|	blob \| history

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