Merge branch '2.0'
Conflicts: src/plugins/cppeditor/cppquickfix.cpp src/plugins/mercurial/mercurialjobrunner.cpp src/plugins/subversion/subversionplugin.cpp
Please register or sign in to comment
Conflicts: src/plugins/cppeditor/cppquickfix.cpp src/plugins/mercurial/mercurialjobrunner.cpp src/plugins/subversion/subversionplugin.cpp