diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2024-01-30 09:00:47 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2024-01-30 09:19:06 +0100 |
| commit | 30d048a256282c50e081d27dec25f37c5a5dfcd6 (patch) | |
| tree | 31b6d6d1a977cad30021c91111e3ef0381f6b9d6 /src/shared | |
| parent | 7e8aac5f3c332bc1bc3e947dedad3157cdc43fcd (diff) | |
| parent | 79e323afbfc8c4a43580a993fb668215387c9564 (diff) | |
Merge remote-tracking branch 'origin/12.0'
Conflicts:
src/plugins/cppeditor/cppfilesettingspage.cpp
src/plugins/haskell/haskellplugin.h
Change-Id: I880693c2e4986853b7aa600a5b7d6c09ad14634e
Diffstat (limited to 'src/shared')
| m--------- | src/shared/qbs | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/src/shared/qbs b/src/shared/qbs -Subproject aa044048f0b3573ddda09d1b7a4483af9eed3de +Subproject 0d589c18b570ce895cf3d6e69545439c2f68eba |