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: 4feacde 8031462)

author	drh <drh@noemail.net>
	Mon, 9 Mar 2015 13:18:22 +0000 (13:18 +0000)
committer	drh <drh@noemail.net>
	Mon, 9 Mar 2015 13:18:22 +0000 (13:18 +0000)
commit	5817b2a18e29e43b115cafaf456284099a914bc0
tree	1f2024b46ffae7995ae8606048cff4579c88b802	tree \| snapshot
parent	4feacdeb25605cc6c5aaa4266fcc25ad4c541008	commit \| diff
parent	80314629393b0bf728465d15ec1f2428c2e9d5c9	commit \| diff

Merge recent trunk enhancements into the apple-osx branch.

FossilOrigin-Name: 5e04eec88e4f5cb9d57577ee2d9e3569de930fbb

16 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/main.c	diff1 \|	diff2 \|	blob \| history
src/os_unix.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/test_config.c	diff1 \|	diff2 \|	blob \| history
src/vdbe.c	diff1 \|	diff2 \|	blob \| history
src/vdbeapi.c	diff1 \|	diff2 \|	blob \| history
test/pragma.test	diff1 \|	diff2 \|	blob \| history
test/shrink.test	diff1 \|	diff2 \|	blob \| history
tool/mksqlite3c.tcl	diff1 \|	diff2 \|	blob \| history

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