forked from qt-creator/qt-creator
Conflicts: src/plugins/texteditor/codestyleselectorwidget.cpp src/plugins/updateinfo/updateinfoplugin.cpp Change-Id: Iac33b852ccef6018bd81188716526aa70c3f5a2d
Conflicts: src/plugins/texteditor/codestyleselectorwidget.cpp src/plugins/updateinfo/updateinfoplugin.cpp Change-Id: Iac33b852ccef6018bd81188716526aa70c3f5a2d