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: 253df3a 0fe5f95)

author	drh <drh@noemail.net>
	Wed, 14 Sep 2011 19:05:55 +0000 (19:05 +0000)
committer	drh <drh@noemail.net>
	Wed, 14 Sep 2011 19:05:55 +0000 (19:05 +0000)
commit	b19e7036cd86c6c8ec84a0a21b627d47731cd083
tree	25faa3682ccd15b38720964e78dbaea3804f1f6c	tree \| snapshot
parent	253df3a264cb6eaf125c009399aac52ea37d6d66	commit \| diff
parent	0fe5f95c7ffd39599b27918927eb424e63fd36ee	commit \| diff

Merge in the latest changes from trunk.

FossilOrigin-Name: 2456b4d0d2522dd2541146031347bc5e51f2036f

13 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/btree.c	diff1 \|	diff2 \|	blob \| history
src/os_unix.c	diff1 \|	diff2 \|	blob \| history
src/pager.c	diff1 \|	diff2 \|	blob \| history
src/select.c	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
test/pager1.test	diff1 \|	diff2 \|	blob \| history
test/wal5.test	diff1 \|	diff2 \|	blob \| history

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