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: 3314d12 f0b9729)

author	drh <drh@noemail.net>
	Sat, 25 Aug 2012 01:38:39 +0000 (01:38 +0000)
committer	drh <drh@noemail.net>
	Sat, 25 Aug 2012 01:38:39 +0000 (01:38 +0000)
commit	78fffbf2c226cbae2b47bfd70f283c9ffaeeaf71
tree	57788857f72323b0ccd106dd14b342512f65534e	tree \| snapshot
parent	3314d12e03da62821ebe025d7aa0690cd155964d	commit \| diff
parent	f0b9729242bf68fc407eb22c522a0308e83cd0c2	commit \| diff

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

FossilOrigin-Name: 6723add4f492c30b20db8de6ed818c191dedea40

23 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/func.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/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
src/vdbetrace.c	diff1 \|	diff2 \|	blob \| history
test/pragma.test	diff1 \|	diff2 \|	blob \| history
test/walro.test	diff1 \|	diff2 \|	blob \| history
test/walthread.test	diff1 \|	diff2 \|	blob \| history
tool/mksqlite3c.tcl	diff1 \|	diff2 \|	blob \| history

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