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: 3aed0eb 155812d)

author	drh <drh@noemail.net>
	Fri, 8 Jun 2012 01:13:17 +0000 (01:13 +0000)
committer	drh <drh@noemail.net>
	Fri, 8 Jun 2012 01:13:17 +0000 (01:13 +0000)
commit	1489c18b997b482c2cbb1188957a072ec7db84e5
tree	200782bb966abe85ddee9d2373ec9c5a2de9079c	tree \| snapshot
parent	3aed0eb475c11f3458143c9e082318239bb895d6	commit \| diff
parent	155812d31809c72a5066212ba93704ad3b204b70	commit \| diff

Merge trunk changes into the apple-osx branch.

FossilOrigin-Name: 9d1b8515625ce7fbde170180126bd1a273bb4994

24 files changed:

Makefile.in	diff1 \|	diff2 \|	blob \| history
ext/rtree/rtree.c	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/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/pager.h	diff1 \|	diff2 \|	blob \| history
src/pragma.c	diff1 \|	diff2 \|	blob \| history
src/prepare.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/test_config.c	diff1 \|	diff2 \|	blob \| history
src/vdbe.c	diff1 \|	diff2 \|	blob \| history
test/pager1.test	diff1 \|	diff2 \|	blob \| history
test/pragma.test	diff1 \|	diff2 \|	blob \| history
test/shared.test	diff1 \|	diff2 \|	blob \| history
test/tester.tcl	diff1 \|	diff2 \|	blob \| history
test/wal.test	diff1 \|	diff2 \|	blob \| history
tool/mksqlite3c.tcl	diff1 \|	diff2 \|	blob \| history

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