summaryrefslogtreecommitdiff
path: root/src/plugins/diffeditor/diffeditorfactory.cpp
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@qt.io>2023-01-13 09:16:25 +0100
committerEike Ziller <eike.ziller@qt.io>2023-01-13 09:16:25 +0100
commit2688a9629c21a8416c5d981dd0655ba8df901f95 (patch)
tree9d9256f997c97ddb3dcbd80c894747535b90d029 /src/plugins/diffeditor/diffeditorfactory.cpp
parentccff024a66f9213b6ac811a098058061cd2f37f5 (diff)
parent1b6d434c9c045d09d3760f7db2025e29d37dc25c (diff)
downloadqt-creator-2688a9629c21a8416c5d981dd0655ba8df901f95.tar.gz
Merge remote-tracking branch 'origin/9.0'
Conflicts: src/libs/utils/pathchooser.cpp src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp Change-Id: I7ae3f91618c4a4ccb088679caea72b2a81590960
Diffstat (limited to 'src/plugins/diffeditor/diffeditorfactory.cpp')
0 files changed, 0 insertions, 0 deletions