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: 78fffbf 19038f1)

author	dan <dan@noemail.net>
	Fri, 31 Aug 2012 14:10:24 +0000 (14:10 +0000)
committer	dan <dan@noemail.net>
	Fri, 31 Aug 2012 14:10:24 +0000 (14:10 +0000)
commit	4e76b649691c71ab59745aae60523afebb5459d8
tree	9cc8d9ddedc8fd7812449fc1841619e388cc7888	tree \| snapshot
parent	78fffbf2c226cbae2b47bfd70f283c9ffaeeaf71	commit \| diff
parent	19038f1b79fb7d29225a5a444353846bc474a58b	commit \| diff

Merge in latest trunk changes.

FossilOrigin-Name: bc9b9cd0589c4a51ece2e4657d622a04fc203315

14 files changed:

manifest	diff1 \|	diff2 \|	blob \| history
manifest.uuid	diff1 \|	diff2 \|	blob \| history
src/btree.c	diff1 \|	diff2 \|	blob \| history
src/main.c	diff1 \|	diff2 \|	blob \| history
src/os_unix.c	diff1 \|	diff2 \|	blob \| history
src/os_win.c	diff1 \|	diff2 \|	blob \| history
src/pager.c	diff1 \|	diff2 \|	blob \| history
src/select.c	diff1 \|	diff2 \|	blob \| history
src/sqlite.h.in	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
test/wal2.test	diff1 \|	diff2 \|	blob \| history

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