← Back to branch summary

~unity-team/unity/libunity-7.0-breakage

~unity-team/unity/libunity-7.0-breakage

Viewing all changes in revision 3144.

Committer: Tarmac
Author(s): Christopher Lee, Chris Townsend
Date: 2013-05-15 21:04:22 UTC
mfrom: (3139.3.2 libunity-7.0-breakage)
Revision ID: tarmac-20130515210422-k4msqcmekh3aqb89

Resolve conflicts in merging updated autopilot tests.

Approved by Pawel Stolowski, PS Jenkins bot.

files added:
tests/autopilot/unity/emulators/X11.py

tests/autopilot/unity/emulators/compiz.py

files modified:
plugins/unityshell/src/unityshell.cpp

tests/autopilot/unity/emulators/__init__.py

tests/autopilot/unity/emulators/dash.py

tests/autopilot/unity/emulators/hud.py

tests/autopilot/unity/emulators/launcher.py

tests/autopilot/unity/emulators/panel.py

tests/autopilot/unity/emulators/quicklist.py

tests/autopilot/unity/emulators/switcher.py

tests/autopilot/unity/emulators/workspace.py

tests/autopilot/unity/tests/__init__.py

tests/autopilot/unity/tests/launcher/__init__.py

tests/autopilot/unity/tests/launcher/test_capture.py

tests/autopilot/unity/tests/launcher/test_icon_behavior.py

tests/autopilot/unity/tests/launcher/test_keynav.py

tests/autopilot/unity/tests/launcher/test_reveal.py

tests/autopilot/unity/tests/launcher/test_scroll.py

tests/autopilot/unity/tests/launcher/test_switcher.py

tests/autopilot/unity/tests/test_command_lens.py

tests/autopilot/unity/tests/test_dash.py

tests/autopilot/unity/tests/test_home_lens.py

tests/autopilot/unity/tests/test_hud.py

tests/autopilot/unity/tests/test_ibus.py

tests/autopilot/unity/tests/test_panel.py

tests/autopilot/unity/tests/test_quicklist.py

tests/autopilot/unity/tests/test_shortcut_hint.py

tests/autopilot/unity/tests/test_showdesktop.py

tests/autopilot/unity/tests/test_spread.py

tests/autopilot/unity/tests/test_switcher.py

Show diffs side-by-side

added added

removed removed

plugins/unityshell/src/unityshell.cpp

tests/autopilot/unity/emulators/X11.py

tests/autopilot/unity/emulators/__init__.py

tests/autopilot/unity/emulators/compiz.py

tests/autopilot/unity/emulators/dash.py

tests/autopilot/unity/emulators/hud.py

tests/autopilot/unity/emulators/launcher.py

tests/autopilot/unity/emulators/panel.py

tests/autopilot/unity/emulators/quicklist.py

tests/autopilot/unity/emulators/switcher.py

tests/autopilot/unity/emulators/workspace.py

tests/autopilot/unity/tests/__init__.py

tests/autopilot/unity/tests/launcher/__init__.py

tests/autopilot/unity/tests/launcher/test_capture.py

tests/autopilot/unity/tests/launcher/test_icon_behavior.py

tests/autopilot/unity/tests/launcher/test_keynav.py

tests/autopilot/unity/tests/launcher/test_reveal.py

tests/autopilot/unity/tests/launcher/test_scroll.py

tests/autopilot/unity/tests/launcher/test_switcher.py

tests/autopilot/unity/tests/test_command_lens.py

tests/autopilot/unity/tests/test_dash.py

tests/autopilot/unity/tests/test_home_lens.py

tests/autopilot/unity/tests/test_hud.py

tests/autopilot/unity/tests/test_ibus.py

tests/autopilot/unity/tests/test_panel.py

tests/autopilot/unity/tests/test_quicklist.py

tests/autopilot/unity/tests/test_shortcut_hint.py

tests/autopilot/unity/tests/test_showdesktop.py

tests/autopilot/unity/tests/test_spread.py

tests/autopilot/unity/tests/test_switcher.py

Older »