Viewing all changes in revision 2344.
- Committer: Albert Astals Cid
- Date: 2016-05-05 07:30:08 UTC
- mfrom: (2341.1.42 unity8)
- Revision ID: albert.astals@canonical.com-20160505073008-d8u2rkkh0sg1te0l
Merge
- files added:
- data/devices.conf
- files removed:
- plugins/ScreenGrabber/ScreenGrabber.qmltypes
- tests/autopilot/unity8/settings_wizard
- tests/autopilot/unity8/settings_wizard/tests
- tests/plugins/ScreenGrabber
- files renamed:
- plugins/ScreenGrabber/ => plugins/ScreenshotDirectory/
- plugins/ScreenGrabber/screengrabber.cpp => plugins/ScreenshotDirectory/ScreenshotDirectory.cpp
- plugins/ScreenGrabber/screengrabber.h => plugins/ScreenshotDirectory/ScreenshotDirectory.h
- qml/Components/ScreenGrabber.qml => qml/Components/ItemGrabber.qml
- qml/Components/WindowScreenshot.qml => qml/Components/ItemSnapshot.qml
- files modified:
- data/unity8-dash.desktop.in
expand all
collapse all
added
removed
qml/Launcher/graphics/quicklist_tooltip@30.png
qml/Notifications/grip-large.svg
