Eike Ziller 0dfa542bee Merge remote-tracking branch 'origin/9.0' ...

Conflicts:
	src/plugins/cppeditor/cppcodestylesettingspage.h

Change-Id: I1aa4e2f9efc6d9cf9f284aef1abf148be9b93a60

2023-01-10 15:44:55 +01:00

26 KiB

Raw Blame History

View Raw