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: 59967e2 49e77b1)

author	drh <drh@noemail.net>
	Mon, 30 Jun 2014 19:57:04 +0000 (19:57 +0000)
committer	drh <drh@noemail.net>
	Mon, 30 Jun 2014 19:57:04 +0000 (19:57 +0000)
commit	31447e8b014793de0347616b7435305cbb4c01b2
tree	2408b7078dc4d4199acf1a802eb993c07133d4ea	tree \| snapshot
parent	59967e2d2e3e2e3fb9b78e3d9a36b3d8089a8b87	commit \| diff
parent	49e77b19258af1f88465a05e4454cf764650de8e	commit \| diff

Merge the latest trunk changes into the apple-osx branch.

FossilOrigin-Name: f426876fe1cc9ebcda5a52f823f417a4db358517

Makefile.in	diff1 \|	diff2 \|	blob \| history
main.mk	diff1 \|	diff2 \|	blob \| history
manifest	diff1 \|	diff2 \|	blob \| history
manifest.uuid	diff1 \|	diff2 \|	blob \| history
src/func.c	diff1 \|	diff2 \|	blob \| history
src/main.c	diff1 \|	diff2 \|	blob \| history
src/os_unix.c	diff1 \|	diff2 \|	blob \| history
src/sqliteInt.h	diff1 \|	diff2 \|	blob \| history
src/test1.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