Conflicts:

gui/mainwindow.cpp gui/resultstree.cpp
2009-03-22 19:40:29 +02:00 · 2009-03-22 19:40:29 +02:00 · 855dda69b7
parent 0953995ee3
commit 855dda69b7
2 changed files with 6 additions and 0 deletions
--- a/gui/mainwindow.cpp
+++ b/gui/mainwindow.cpp
@ -292,4 +292,7 @@ void MainWindow::ShowErrors(bool checked)
 {
    mResults.ShowResults(SHOW_ERRORS, checked);
 }
+<<<<<<< HEAD:gui/mainwindow.cpp

+=======
+>>>>>>> gui:gui/mainwindow.cpp
--- a/gui/resultstree.cpp
+++ b/gui/resultstree.cpp
@ -77,7 +77,10 @@ void ResultsTree::AddErrorItem(const QString &file,
    }
 }

+<<<<<<< HEAD:gui/resultstree.cpp

+=======
+>>>>>>> gui:gui/resultstree.cpp
 ShowTypes ResultsTree::SeverityToShowType(const QString &severity)
 {
    if (severity == "all")