Commit 918cac90 authored by mae's avatar mae
Browse files

Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline

parents 94a713c3 a2c7d317
......@@ -431,7 +431,6 @@ GenericMakeStep *GenericProject::makeStep() const
if (GenericMakeStep *ms = qobject_cast<GenericMakeStep *>(bs))
return ms;
}
return 0;
}
......
......@@ -21,7 +21,6 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
<dependencyList>
<dependency name="Core" version="1.1.80"/>
<dependency name="Find" version="1.1.80"/>
<dependency name="Help" version="1.1.80"/>
<dependency name="QuickOpen" version="1.1.80"/>
<dependency name="TextEditor" version="1.1.80"/>
</dependencyList>
......
......@@ -3,4 +3,3 @@ include(../../plugins/quickopen/quickopen.pri)
include(../../plugins/find/find.pri)
include(../../plugins/coreplugin/coreplugin.pri)
include(../../plugins/texteditor/texteditor.pri)
include(../../plugins/help/help.pri)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment