walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Merge conflicts.

This commit is contained in:
Vesa Pikki 2009-03-22 19:41:32 +02:00
parent 855dda69b7
commit 1e66d7f0e4
2 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gui/mainwindow.cpp
View File

@ -292,7 +292,3 @@ void MainWindow::ShowErrors(bool checked)
{ {
mResults.ShowResults(SHOW_ERRORS, checked); mResults.ShowResults(SHOW_ERRORS, checked);
} }
<<<<<<< HEAD:gui/mainwindow.cpp
=======
>>>>>>> gui:gui/mainwindow.cpp

5
gui/resultstree.cpp
View File

@ -77,11 +77,8 @@ void ResultsTree::AddErrorItem(const QString &file,
} }
} }
<<<<<<< HEAD:gui/resultstree.cpp
======= ShowTypes ResultsTree::SeverityToShowType(const QString & severity)
>>>>>>> gui:gui/resultstree.cpp
ShowTypes ResultsTree::SeverityToShowType(const QString &severity)
{ {
if (severity == "all") if (severity == "all")
return SHOW_ALL; return SHOW_ALL;