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: cc40f4c 6785587)

author	drh <drh@noemail.net>
	Tue, 11 Oct 2011 14:19:38 +0000 (14:19 +0000)
committer	drh <drh@noemail.net>
	Tue, 11 Oct 2011 14:19:38 +0000 (14:19 +0000)
commit	0d92f761edf536847df3f32f0af2cd953357b53f
tree	d0fd42876f0cfe8d053a6d266711cb0aecac4fe5	tree \| snapshot
parent	cc40f4ceb19cccd973c15bbee57a005dfb9dc45a	commit \| diff
parent	67855877ffa8a1d70ab17a65ead5dd3872e4623a	commit \| diff

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

FossilOrigin-Name: 7e2c4898224f9fabf724a6d4e1ac597845a66f73

20 files changed:

Makefile.in	diff1 \|	diff2 \|	blob \| history
main.mk	diff1 \|	diff2 \|	blob \| history
manifest	diff1 \|	diff2 \|	blob \| history
manifest.uuid	diff1 \|	diff2 \|	blob \| history
src/backup.c	diff1 \|	diff2 \|	blob \| history
src/btree.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/pragma.c	diff1 \|	diff2 \|	blob \| history
src/sqlite.h.in	diff1 \|	diff2 \|	blob \| history
src/sqliteInt.h	diff1 \|	diff2 \|	blob \| history
src/test_config.c	diff1 \|	diff2 \|	blob \| history
src/vdbeaux.c	diff1 \|	diff2 \|	blob \| history
test/memdb.test	diff1 \|	diff2 \|	blob \| history
test/memsubsys1.test	diff1 \|	diff2 \|	blob \| history
test/pager1.test	diff1 \|	diff2 \|	blob \| history
test/superlock.test	diff1 \|	diff2 \|	blob \| history
test/walbig.test	diff1 \|	diff2 \|	blob \| history
test/walro.test	diff1 \|	diff2 \|	blob \| history

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