Merge branch 'gui'

Conflicts:

	gui/resultstree.cpp
This commit is contained in:
Vesa Pikki 2009-03-22 19:42:45 +02:00
commit f752cca1e2
1 changed files with 0 additions and 1 deletions

View File

@ -77,7 +77,6 @@ void ResultsTree::AddErrorItem(const QString &file,
} }
} }
ShowTypes ResultsTree::SeverityToShowType(const QString & severity) ShowTypes ResultsTree::SeverityToShowType(const QString & severity)
{ {
if (severity == "all") if (severity == "all")