← Back to branch summary

~fginther/unity/100-scopes-search-tests

~fginther/unity/100-scopes-search-tests

Viewing all changes in revision 3087.

Committer: Tarmac
Author(s): Brandon Schaefer, Marco Trevisan (Treviño), Automatic PS uploader, Andrea Azzarone, Nick Dedekind, Mathieu Trudel-Lapierre
Date: 2013-03-20 14:10:14 UTC
mfrom: (3086.1.1 unity)
Revision ID: tarmac-20130320141014-rfjcma29kgvan0gd

Merge with trunk.

Approved by PS Jenkins bot, Didier Roche.

files added:
resources/launcher_pip_large_ltr.png

resources/launcher_pip_large_rtl.png

tests/test_im_text_entry.h

tests/test_im_text_entry_class.cpp

tests/test_im_text_entry_slow.cpp

files removed:
resources/launcher_icon_back_170.png

resources/launcher_icon_edge_170.png

resources/launcher_icon_selected_back_170.png

resources/launcher_icon_selected_edge_170.png

resources/launcher_icon_shine_170.png

files modified:
CMakeLists.txt

dash/ApplicationStarter.h

dash/DashController.cpp

dash/DashView.cpp

dash/ScopeBar.cpp

debian/changelog

hud/HudAbstractView.h

hud/HudController.cpp

hud/HudView.cpp

hud/HudView.h

launcher/Launcher.cpp

launcher/LauncherIcon.cpp

launcher/LauncherIcon.h

launcher/MockLauncherIcon.h

launcher/QuicklistMenuItem.cpp

launcher/SimpleLauncherIcon.cpp

launcher/StandaloneLauncher.cpp

launcher/SwitcherController.cpp

panel/PanelView.cpp

plugins/unityshell/src/unityshell.cpp

po/POTFILES.in

resources/launcher_icon_edge_150.png

resources/launcher_icon_edge_54.png

shutdown/SessionButton.cpp

shutdown/SessionButton.h

shutdown/SessionController.cpp

shutdown/SessionView.cpp

shutdown/SessionView.h

tests/CMakeLists.txt

tests/autopilot/unity/emulators/launcher.py

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

tests/autopilot/unity/tests/test_hud.py

tests/test_im_text_entry.cpp

tests/test_quicklist_menu_item.cpp

tests/test_session_button.cpp

tests/test_session_controller.cpp

tests/test_session_view.cpp

unity-shared/IconRenderer.cpp

unity-shared/IconRenderer.h

unity-shared/Timer.h

unity-shared/UBusMessages.h

unity-shared/WindowButtons.cpp

Show diffs side-by-side

added added

removed removed

dash/ApplicationStarter.h

dash/DashController.cpp

dash/DashView.cpp

dash/ScopeBar.cpp

debian/changelog

hud/HudAbstractView.h

hud/HudController.cpp

hud/HudView.cpp

launcher/Launcher.cpp

launcher/LauncherIcon.cpp

launcher/LauncherIcon.h

launcher/MockLauncherIcon.h

launcher/QuicklistMenuItem.cpp

launcher/SimpleLauncherIcon.cpp

launcher/StandaloneLauncher.cpp

launcher/SwitcherController.cpp

panel/PanelView.cpp

plugins/unityshell/src/unityshell.cpp

resources/launcher_icon_back_170.png

resources/launcher_icon_edge_150.png

resources/launcher_icon_edge_170.png

resources/launcher_icon_edge_54.png

resources/launcher_icon_selected_back_170.png

resources/launcher_icon_selected_edge_170.png

resources/launcher_icon_shine_170.png

resources/launcher_pip_large_ltr.png

resources/launcher_pip_large_rtl.png

shutdown/SessionButton.cpp

shutdown/SessionButton.h

shutdown/SessionController.cpp

shutdown/SessionView.cpp

shutdown/SessionView.h

tests/CMakeLists.txt

tests/autopilot/unity/emulators/launcher.py

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

tests/autopilot/unity/tests/test_hud.py

tests/test_im_text_entry.cpp

tests/test_im_text_entry.h

tests/test_im_text_entry_class.cpp

tests/test_im_text_entry_slow.cpp

tests/test_quicklist_menu_item.cpp

tests/test_session_button.cpp

tests/test_session_controller.cpp

tests/test_session_view.cpp

unity-shared/IconRenderer.cpp

unity-shared/IconRenderer.h

unity-shared/Timer.h

unity-shared/UBusMessages.h

unity-shared/WindowButtons.cpp

Older »