forked from qt-creator/qt-creator
Conflicts: src/plugins/coreplugin/editormanager/editormanager.cpp Change-Id: I80fe565749ad5c06dfe99436f2dc6ab4b66a2537
Conflicts: src/plugins/coreplugin/editormanager/editormanager.cpp Change-Id: I80fe565749ad5c06dfe99436f2dc6ab4b66a2537