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: 0a99e9f e4a0d79)

author	drh <drh@noemail.net>
	Wed, 28 Jan 2015 12:00:40 +0000 (12:00 +0000)
committer	drh <drh@noemail.net>
	Wed, 28 Jan 2015 12:00:40 +0000 (12:00 +0000)
commit	120b3a4f6112149c58d6f2ddd7e8e9498d9b201a
tree	10fc4b6826ec68cfee5bfa3611c04f09982b4524	tree
parent	0a99e9fb01446941311cab7aa9eec267169c4485	commit \| diff
parent	e4a0d79b8a0cd9cb4a3aa63a48402dd936454ded	commit \| diff

Merge in all changes from trunk.

FossilOrigin-Name: 17c69be80542c5f84e21d60df3edc49422b087d9

18 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/pragma.c	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/test_config.c	diff1 \|	diff2 \|	blob \| history
src/wal.c	diff1 \|	diff2 \|	blob \| history
test/permutations.test	diff1 \|	diff2 \|	blob \| history
test/releasetest.tcl	diff1 \|	diff2 \|	blob \| history
tool/mkpragmatab.tcl	diff1 \|	diff2 \|	blob \| history

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