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: 7712ac4 6609bab)

author	drh <drh@noemail.net>
	Tue, 15 Sep 2015 17:20:41 +0000 (17:20 +0000)
committer	drh <drh@noemail.net>
	Tue, 15 Sep 2015 17:20:41 +0000 (17:20 +0000)
commit	9827122af5eefa7574a91dbda08be10f787b322a
tree	1cdba82c1abf716fe51684a365e41f8553ab34b4	tree \| snapshot
parent	7712ac43e8975cebf85fa2e84156f76591c0e360	commit \| diff
parent	6609bab24d84219140f28d9bda1ebee4389be5ca	commit \| diff

Merge trunk enhancements into the apple-osx branch.

FossilOrigin-Name: f12b8a0f7958260cb8e6b9be1aaa583cf383b39c

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/pager.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/vdbeapi.c	diff1 \|	diff2 \|	blob \| history
src/wal.c	diff1 \|	diff2 \|	blob \| history
test/pragma.test	diff1 \|	diff2 \|	blob \| history

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