← Back to branch summary

~unity-team/unity/7.1

~unity-team/unity/7.1

Viewing all changes in revision 3144.4.72.

Committer: Marco Trevisan (Treviño)
Date: 2013-03-07 16:48:26 UTC
mfrom: (3144.3.31 closable-window)
mto: This revision was merged to the branch mainline in revision 3200.
Revision ID: mail@3v1n0.net-20130307164826-68mbrsgxryj34aoi

Merging with closable-window (and trunk)

files added:
debian/scopes-recommends-generator

launcher/TooltipManager.cpp

launcher/TooltipManager.h

tests/autopilot/unity/tests/launcher/test_tooltips.py

tests/test_panel_view.cpp

tests/test_tooltip_manager.cpp

tests/test_unity_window_style.cpp

tests/test_unity_window_view.cpp

files renamed:
tests/test_service_gdbus_wrapper.c => tests/test_service_gdbus_wrapper.cpp

tests/test_service_hud.c => tests/test_service_hud.cpp

tests/test_service_lens.c => tests/test_service_lens.cpp

tests/test_service_main.c => tests/test_service_main.cpp

tests/test_service_model.c => tests/test_service_model.cpp

tests/test_service_panel.c => tests/test_service_panel.cpp

files modified:
CMakeLists.txt

config.h.cmake

dash/DashController.cpp

dash/DashController.h

debian/changelog

debian/control

debian/rules

hud/HudController.cpp

launcher/AbstractLauncherIcon.h

launcher/BFBLauncherIcon.cpp

launcher/CMakeLists.txt

launcher/HudLauncherIcon.cpp

launcher/Launcher.cpp

launcher/Launcher.h

launcher/LauncherController.cpp

launcher/LauncherControllerPrivate.h

launcher/LauncherIcon.cpp

launcher/MockLauncherIcon.h

launcher/StandaloneLauncher.cpp

launcher/XdndCollectionWindowImp.cpp

panel/PanelController.cpp

panel/PanelView.cpp

panel/PanelView.h

plugins/unityshell/src/unitya11ytests.cpp

plugins/unityshell/src/unityshell.cpp

services/panel-service.c

tests/CMakeLists.txt

tests/autopilot/unity/tests/test_search.py

tests/test_categories.cpp

tests/test_filesystem_lenses.cpp

tests/test_gdbus_proxy.cpp

tests/test_launcher.cpp

tests/test_launcher_controller.cpp

tests/test_lens.cpp

tests/test_main_dbus.cpp

tests/test_model.cpp

tests/test_results.cpp

tests/test_service_gdbus_wrapper.h

tests/test_service_hud.h

tests/test_service_lens.h

tests/test_service_model.h

tests/test_service_panel.h

tests/test_software_center_launcher_icon.cpp

tests/test_thumbnail_generator.cpp

tests/test_utils.h

unity-shared/DebugDBusInterface.cpp

unity-shared/DebugDBusInterface.h

unity-shared/MockableBaseWindow.h

unity-shared/UBusMessages.h

unity-shared/UnityWindowView.h

unity-shared/WindowButtons.cpp

Show diffs side-by-side

added added

removed removed

dash/DashController.cpp

dash/DashController.h

debian/changelog

debian/scopes-recommends-generator

hud/HudController.cpp

launcher/AbstractLauncherIcon.h

launcher/BFBLauncherIcon.cpp

launcher/CMakeLists.txt

launcher/HudLauncherIcon.cpp

launcher/Launcher.cpp

launcher/Launcher.h

launcher/LauncherController.cpp

launcher/LauncherControllerPrivate.h

launcher/LauncherIcon.cpp

launcher/MockLauncherIcon.h

launcher/StandaloneLauncher.cpp

launcher/TooltipManager.cpp

launcher/TooltipManager.h

launcher/XdndCollectionWindowImp.cpp

panel/PanelController.cpp

panel/PanelView.cpp

panel/PanelView.h

plugins/unityshell/src/unitya11ytests.cpp

plugins/unityshell/src/unityshell.cpp

services/panel-service.c

tests/CMakeLists.txt

tests/autopilot/unity/tests/launcher/test_tooltips.py

tests/autopilot/unity/tests/test_search.py

tests/test_categories.cpp

tests/test_filesystem_lenses.cpp

tests/test_gdbus_proxy.cpp

tests/test_launcher.cpp

tests/test_launcher_controller.cpp

tests/test_lens.cpp

tests/test_main_dbus.cpp

tests/test_model.cpp

tests/test_panel_view.cpp

tests/test_results.cpp

tests/test_service_gdbus_wrapper.cpp

tests/test_service_gdbus_wrapper.h

tests/test_service_hud.cpp

tests/test_service_hud.h

tests/test_service_lens.cpp

tests/test_service_lens.h

tests/test_service_main.cpp

tests/test_service_model.cpp

tests/test_service_model.h

tests/test_service_panel.cpp

tests/test_service_panel.h

tests/test_software_center_launcher_icon.cpp

tests/test_thumbnail_generator.cpp

tests/test_unity_window_style.cpp

tests/test_unity_window_view.cpp

tests/test_utils.h

unity-shared/DebugDBusInterface.cpp

unity-shared/DebugDBusInterface.h

unity-shared/MockableBaseWindow.h

unity-shared/UBusMessages.h

unity-shared/UnityWindowView.h

unity-shared/WindowButtons.cpp

Older »