Eike Ziller
a2f21d40f5
Merge remote-tracking branch 'origin/8.0'
Conflicts:
src/plugins/debugger/debuggerdialogs.cpp
src/plugins/qmldesigner/components/materialeditor/materialeditorview.cpp
src/plugins/texteditor/fontsettingspage.cpp
Change-Id: I5a6accd2065e0d8320045b57ade7b54a9a09aae0
2022-08-31 11:03:13 +02:00
..
2022-08-26 12:27:18 +00:00
2022-08-31 11:03:13 +02:00
2020-05-18 10:15:03 +00:00
2022-08-26 12:27:18 +00:00
2022-08-26 12:27:18 +00:00
2022-08-26 12:27:18 +00:00
2022-02-03 10:40:05 +00:00
2022-08-26 12:27:18 +00:00
2022-08-26 12:27:18 +00:00
2022-08-26 12:27:18 +00:00
2022-08-26 12:27:18 +00:00
2020-05-18 10:15:03 +00:00