]> git.ipfire.org Git - thirdparty/sqlite.git/commit
projects / thirdparty / sqlite.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 03f275e 4bf66fd)
Incremental merge to prevent a huge pileup of merge conflicts resulting
authordrh <drh@noemail.net>
Thu, 19 Feb 2015 15:56:27 +0000 (15:56 +0000)
committerdrh <drh@noemail.net>
Thu, 19 Feb 2015 15:56:27 +0000 (15:56 +0000)
commit0a175660d2590e8a57eeee90b40ac374f9f370eb
treef581adeadd7cc33a2fbff035c22c38df537d3e7ftree | snapshot
parent03f275ea839dae560431e221c22c3bc30f61a27dcommit | diff
parent4bf66fd6f39c310eabd214b176b75d30a6073181commit | diff
Incremental merge to prevent a huge pileup of merge conflicts resulting
from editing the same code in two different branches.

FossilOrigin-Name: 82c4c4e248bfca38bc3285d5a8414f7180c2eab5
manifest diff1 | diff2 | blob | history
manifest.uuid diff1 | diff2 | blob | history
src/os_unix.c diff1 | diff2 | blob | history
src/sqlite.h.in diff1 | diff2 | blob | history
Mirror of https://github.com/sqlite/sqlite.git