« back to all changes in this revision
Viewing changes to qml/ApplicationMenus/qmldir
- Committer: Lukáš Tinkl
- Date: 2017-03-24 11:57:27 UTC
- mfrom: (2800.1.91 unity8)
- Revision ID: lukas.tinkl@canonical.com-20170324115727-34c7tvv3qnxvxzdj
merge trunk
- files added:
- plugins/Utils/expressionfiltermodel.cpp
- tests/plugins/WindowManager
- tools/menutool
- tools/scopetool
- files removed:
- qml/Launcher/graphics/home@18.png
- files renamed:
- tools/registry-tracker.cpp => tools/scopetool/registry-tracker.cpp
- tools/registry-tracker.h => tools/scopetool/registry-tracker.h
- tools/scopetool.cpp => tools/scopetool/scopetool.cpp
- files modified:
- CMakeLists.txt
added
removed
qml/ApplicationMenus/qmldir
