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: be734c6 4192a95)

author	stephan <stephan@noemail.net>
	Fri, 7 Feb 2025 11:21:07 +0000 (11:21 +0000)
committer	stephan <stephan@noemail.net>
	Fri, 7 Feb 2025 11:21:07 +0000 (11:21 +0000)
commit	e76797072fab39e34df0347f014f04611eb38be7
tree	85a45d6bc3156c48c8bfe201c32df67f192fe594	tree \| snapshot
parent	be734c6b176d0dbbbe2a1a44b4a0a8834ef8d405	commit \| diff
parent	4192a95d23f828bb556b8602ac4df6edeb002ffc	commit \| diff

Merge trunk into mac-build-fixes branch and resolve a doc-only merge conflict.

FossilOrigin-Name: 5df30deb787bfe4785a06af0149151aa2fdca14deccfa8a8bd819eeb0a59fb1e

autoconf/Makefile.in	diff1 \|	diff2 \|	blob \| history
manifest	diff1 \|	diff2 \|	blob \| history
manifest.uuid	diff1 \|	diff2 \|	blob \| history

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