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: 54f0dec 643091f)

author	dan <dan@noemail.net>
	Fri, 21 Nov 2014 14:37:24 +0000 (14:37 +0000)
committer	dan <dan@noemail.net>
	Fri, 21 Nov 2014 14:37:24 +0000 (14:37 +0000)
commit	841ed2b0f2bd9def5d529579d3cdb3ffeb41c6e0
tree	4e3b1fc0e9ed749da1df6a1aa520cd365f316090	tree
parent	54f0dec3e65be2362530678c367cfc88db965dec	commit \| diff
parent	643091f07104b3dd2e3793286ddb1f1b5eb99f87	commit \| diff

Merge latest trunk changes with this branch.

FossilOrigin-Name: 7ef44c5b5bd30bcc4ef59ed172b9ce9ac6a843f6

14 files changed:

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/delete.c	diff1 \|	diff2 \|	blob \| history
src/main.c	diff1 \|	diff2 \|	blob \| history
src/pager.c	diff1 \|	diff2 \|	blob \| history
src/pager.h	diff1 \|	diff2 \|	blob \| history
src/sqlite.h.in	diff1 \|	diff2 \|	blob \| history
src/sqliteInt.h	diff1 \|	diff2 \|	blob \| history
src/tclsqlite.c	diff1 \|	diff2 \|	blob \| history
src/test1.c	diff1 \|	diff2 \|	blob \| history
src/vdbeblob.c	diff1 \|	diff2 \|	blob \| history
src/wal.c	diff1 \|	diff2 \|	blob \| history

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