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: e0ba85d 76aad0d)

author	drh <drh@noemail.net>
	Fri, 10 Feb 2012 18:18:00 +0000 (18:18 +0000)
committer	drh <drh@noemail.net>
	Fri, 10 Feb 2012 18:18:00 +0000 (18:18 +0000)
commit	2f1e7b8a7418f06adfc345bf6e9665d4bc15ca65
tree	1059d0811d53c78890dc196a72b86f5d4913162e	tree \| snapshot
parent	e0ba85df8b1e708a31d4ecab020056555856240a	commit \| diff
parent	76aad0d1dfa48ec113de235766573f26e0bb32d4	commit \| diff

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

FossilOrigin-Name: e248598649dd69ed4b4d3da80566d2a7a36a349a

15 files changed:

manifest	diff1 \|	diff2 \|	blob \| history
manifest.uuid	diff1 \|	diff2 \|	blob \| history
src/btree.c	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/pager.c	diff1 \|	diff2 \|	blob \| history
src/pragma.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/test1.c	diff1 \|	diff2 \|	blob \| history
src/vdbe.c	diff1 \|	diff2 \|	blob \| history
src/vdbeaux.c	diff1 \|	diff2 \|	blob \| history
test/pager1.test	diff1 \|	diff2 \|	blob \| history

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