Eike Ziller 30d048a256 Merge remote-tracking branch 'origin/12.0' ...

Conflicts:
	src/plugins/cppeditor/cppfilesettingspage.cpp
	src/plugins/haskell/haskellplugin.h

Change-Id: I880693c2e4986853b7aa600a5b7d6c09ad14634e

2024-01-30 09:19:06 +01:00

44 KiB

Raw Blame History

View Raw