-
Eike Ziller authored
Conflicts: share/qtcreator/debugger/creatortypes.py src/plugins/beautifier/clangformat/clangformat.cpp Change-Id: I1ab281c190767ced8a6ac2c026a121ea229a36cf
3d751dcf
Conflicts: share/qtcreator/debugger/creatortypes.py src/plugins/beautifier/clangformat/clangformat.cpp Change-Id: I1ab281c190767ced8a6ac2c026a121ea229a36cf