Eike Ziller
502223337d
Merge remote-tracking branch 'origin/7.0'
Conflicts:
src/plugins/clangformat/clangformatconfigwidget.cpp
src/plugins/clangformat/clangformatplugin.cpp
src/plugins/cppeditor/cppcodestylepreferencesfactory.cpp
src/plugins/cppeditor/cppcodestylepreferencesfactory.h
src/plugins/nim/settings/nimcodestylepreferencesfactory.cpp
src/plugins/nim/settings/nimcodestylepreferencesfactory.h
src/plugins/qmljstools/qmljscodestylepreferencesfactory.cpp
src/plugins/qmljstools/qmljscodestylepreferencesfactory.h
src/plugins/texteditor/codestyleselectorwidget.cpp
src/plugins/texteditor/icodestylepreferencesfactory.h
Change-Id: I20ee430a7f0085774c9df1aa5487046ba4f404c1
2022-05-10 12:13:36 +02:00
..
2018-04-24 14:43:35 +00:00
2022-04-07 11:42:37 +00:00
2022-01-24 12:13:19 +00:00
2018-12-07 18:42:04 +00:00
2022-04-07 11:42:37 +00:00
2022-04-08 04:57:00 +00:00
2022-05-10 12:13:36 +02:00
2022-05-10 12:13:36 +02:00
2022-04-08 04:57:00 +00:00
2022-04-08 04:57:00 +00:00
2022-04-07 11:42:37 +00:00
2022-04-07 11:42:37 +00:00
2022-04-08 04:57:00 +00:00
2022-04-07 11:42:37 +00:00
2022-04-08 04:57:00 +00:00
2022-04-08 04:57:00 +00:00
2022-04-07 11:42:37 +00:00
2022-04-07 11:42:37 +00:00
2022-02-11 07:35:30 +00:00
2022-02-11 07:35:30 +00:00
2019-01-31 10:25:18 +00:00
2019-01-31 10:25:18 +00:00
2021-06-28 07:07:57 +00:00
2018-12-07 18:42:04 +00:00
2022-02-25 07:19:58 +00:00
2021-02-18 07:02:07 +00:00
2019-12-18 10:15:50 +00:00
2018-05-07 15:44:57 +00:00
2022-02-04 11:51:52 +00:00
2021-06-08 11:40:10 +00:00
2022-04-22 10:43:38 +00:00
2020-03-03 15:31:10 +00:00
2022-04-29 07:16:53 +00:00
2021-04-27 06:52:05 +00:00
2020-06-16 09:08:36 +00:00
2022-04-08 04:57:00 +00:00
2018-04-24 14:43:35 +00:00
2018-04-23 11:12:26 +00:00
2020-07-06 11:15:18 +00:00
2021-09-01 14:53:58 +00:00
2022-04-07 11:42:37 +00:00
2022-04-07 11:42:37 +00:00