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: 79e319e 3bd1791)

author	drh <drh@noemail.net>
	Fri, 2 Jan 2015 19:17:44 +0000 (19:17 +0000)
committer	drh <drh@noemail.net>
	Fri, 2 Jan 2015 19:17:44 +0000 (19:17 +0000)
commit	e4172fa884e1d9098fcf073ee80831c6a2e9e9cf
tree	90e74fbd731444cf86331a4b09e5b23b5e7e3ef3	tree \| snapshot
parent	79e319ef93cb4a26f2162b4bf76e928b862b0481	commit \| diff
parent	3bd1791dfb535b7137070f81f470bc784eae1943	commit \| diff

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

FossilOrigin-Name: df3cdf9f0690f2724c7e4e0adb2e3bd4b1a4dd26

19 files changed:

Makefile.in	diff1 \|	diff2 \|	blob \| history
ext/rtree/rtree.c	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/sqlite.h.in	diff1 \|	diff2 \|	blob \| history
src/sqliteInt.h	diff1 \|	diff2 \|	blob \| history
src/test1.c	diff1 \|	diff2 \|	blob \| history
src/vdbeaux.c	diff1 \|	diff2 \|	blob \| history
src/wal.c	diff1 \|	diff2 \|	blob \| history
test/memsubsys1.test	diff1 \|	diff2 \|	blob \| history
test/wal5.test	diff1 \|	diff2 \|	blob \| history
tool/mksqlite3c.tcl	diff1 \|	diff2 \|	blob \| history

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