Commit 82ce382f authored by con's avatar con
Browse files

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

parents 3de823ca 7a25f6c3
......@@ -30,7 +30,7 @@ HEADERS += \
timelineview.h
RESOURCES += \
qmlprofiler.qrc
qml/qml.qrc
OTHER_FILES += \
Detail.qml \
......
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