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: edb5866 f8ede57)

author	drh <drh@noemail.net>
	Tue, 2 Sep 2014 15:57:35 +0000 (15:57 +0000)
committer	drh <drh@noemail.net>
	Tue, 2 Sep 2014 15:57:35 +0000 (15:57 +0000)
commit	9cc5985bc48a63d6dbcc70f7823446270aa9563c
tree	18a677204cf09506b774cb6e0de1f767644d809f	tree \| snapshot
parent	edb586616b4ee1e094d2beaafc32035743fb6403	commit \| diff
parent	f8ede57a6165889316f8a9df8ac1166c7a568100	commit \| diff

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

FossilOrigin-Name: 696dc935f78dc883faf98cf446f75ce4028e98f8

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/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/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/test_config.c	diff1 \|	diff2 \|	blob \| history
src/vdbe.c	diff1 \|	diff2 \|	blob \| history
src/vdbeapi.c	diff1 \|	diff2 \|	blob \| history
src/vdbeaux.c	diff1 \|	diff2 \|	blob \| history
test/tester.tcl	diff1 \|	diff2 \|	blob \| history
tool/mksqlite3c.tcl	diff1 \|	diff2 \|	blob \| history

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