~lukas-kde/unity8/closeAppsFromQuicklist
Viewing all changes in revision 1824.
-
Committer:
Lukáš Tinkl
-
Date:
2015-07-21 10:01:32 UTC
-
mfrom:
(1799.1.70 unity8)
-
Revision ID:
lukas.tinkl@canonical.com-20150721100132-jw365jk9oyeja7cx
merge and fix conflict
- files added:
-
plugins/Unity/InputInfo
-
plugins/Unity/InputInfo/linux
-
qml/Components/UnityInputInfo
-
tests/autopilot/unity8/settings_wizard
-
tests/autopilot/unity8/settings_wizard/tests
-
tests/mocks/Unity/InputInfo
- files removed:
-
tests/autopilot/unity8/shell/emulators
-
tests/autopilot/unity8/shell/emulators/tutorial.py
=>
tests/autopilot/unity8/tutorial.py
expand all
collapse all
Show diffs side-by-side
added
removed