← Back to branch summary

~unity-team/unity/trunk

~unity-team/unity/trunk

Viewing all changes in revision 3506.5.36.

Committer: Marco Trevisan (Treviño)
Date: 2013-11-01 07:24:38 UTC
mfrom: (3587 trunk)
mto: (3587.1.1 unity)
mto: This revision was merged to the branch mainline in revision 3588.
Revision ID: mail@3v1n0.net-20131101072438-c6pbcqd2u027o2pl

Merging with trunk

files added:
UnityCore/ActionHandle.h

launcher/DeltaTracker.cpp

launcher/DeltaTracker.h

services/panel-service-private.h

tests/test_action_handle.cpp

tests/test_delta_tracker.cpp

tests/test_standalone_wm.h

files removed:
tests/test_im_text_entry.h

tests/test_im_text_entry_class.cpp

tests/test_im_text_entry_slow.cpp

files renamed:
debian/libunity-core-6.0-7.install => debian/libunity-core-6.0-8.install

debian/libunity-core-6.0-7.lintian-overrides => debian/libunity-core-6.0-8.lintian-overrides

files modified:
CMakeLists.txt

UnityCore/CMakeLists.txt

UnityCore/ConnectionManager.h

UnityCore/GLibSource.cpp

UnityCore/GLibSource.h

UnityCore/Preview.cpp

UnityCore/Preview.h

UnityCore/Scope.cpp

UnityCore/Scope.h

UnityCore/ScopeProxy.cpp

UnityCore/ScopeProxyInterface.h

dash/DashController.cpp

dash/DashController.h

dash/DashView.cpp

dash/DashView.h

dash/ResultRendererTile.cpp

dash/ResultViewGrid.cpp

dash/ResultViewGrid.h

debian/changelog

debian/control

debian/rules

hud/HudController.cpp

hud/HudController.h

launcher/AbstractLauncherIcon.cpp

launcher/AbstractLauncherIcon.h

launcher/ApplicationLauncherIcon.cpp

launcher/ApplicationLauncherIcon.h

launcher/BFBLauncherIcon.cpp

launcher/CMakeLists.txt

launcher/CairoBaseWindow.cpp

launcher/CairoBaseWindow.h

launcher/DesktopLauncherIcon.cpp

launcher/DeviceLauncherSection.cpp

launcher/DeviceLauncherSection.h

launcher/DeviceNotificationDisplayImp.cpp

launcher/EdgeBarrierController.cpp

launcher/EdgeBarrierControllerPrivate.h

launcher/ExpoLauncherIcon.cpp

launcher/HudLauncherIcon.cpp

launcher/Launcher.cpp

launcher/Launcher.h

launcher/LauncherController.cpp

launcher/LauncherController.h

launcher/LauncherControllerPrivate.h

launcher/LauncherIcon.cpp

launcher/LauncherIcon.h

launcher/MockLauncherIcon.h

launcher/QuicklistManager.cpp

launcher/QuicklistManager.h

launcher/QuicklistView.cpp

launcher/QuicklistView.h

launcher/SimpleLauncherIcon.cpp

launcher/SingleMonitorLauncherIcon.cpp

launcher/SingleMonitorLauncherIcon.h

launcher/SoftwareCenterLauncherIcon.cpp

launcher/SpacerLauncherIcon.cpp

launcher/StandaloneLauncher.cpp

launcher/SwitcherController.cpp

launcher/SwitcherController.h

launcher/SwitcherControllerImpl.h

launcher/SwitcherView.cpp

launcher/SwitcherView.h

launcher/Tooltip.cpp

launcher/Tooltip.h

launcher/TrashLauncherIcon.cpp

launcher/Volume.h

launcher/VolumeImp.cpp

launcher/VolumeImp.h

launcher/VolumeLauncherIcon.cpp

launcher/VolumeLauncherIcon.h

launcher/XdndCollectionWindow.h

launcher/XdndCollectionWindowImp.cpp

launcher/XdndCollectionWindowImp.h

launcher/XdndManager.h

launcher/XdndManagerImp.cpp

launcher/XdndManagerImp.h

panel/PanelView.cpp

panel/PanelView.h

plugins/unityshell/src/UnityshellPrivate.cpp

plugins/unityshell/src/UnityshellPrivate.h

plugins/unityshell/src/unityshell.cpp

plugins/unityshell/src/unityshell.h

plugins/unityshell/unityshell.xml.in

services/panel-service.c

shortcuts/ShortcutController.cpp

shortcuts/ShortcutController.h

shutdown/SessionController.cpp

shutdown/SessionController.h

tests/CMakeLists.txt

tests/autopilot/unity/emulators/__init__.py

tests/autopilot/unity/emulators/hud.py

tests/autopilot/unity/emulators/launcher.py

tests/autopilot/unity/emulators/screen.py

tests/autopilot/unity/emulators/switcher.py

tests/autopilot/unity/emulators/window_manager.py

tests/autopilot/unity/tests/__init__.py

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

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

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

tests/autopilot/unity/tests/test_panel.py

tests/autopilot/unity/tests/test_spread.py

tests/autopilot/unity/tests/test_switcher.py

tests/autopilot/unity/tests/test_wm_keybindings.py

tests/data/external.gschema.xml

tests/gmockvolume.c

tests/mock-application.h

tests/mock-base-window.h

tests/test_animation_utils.cpp

tests/test_application_launcher_icon.cpp

tests/test_bamf_application.cpp

tests/test_connection_manager.cpp

tests/test_dash_controller.cpp

tests/test_device_launcher_section.cpp

tests/test_expo_launcher_icon.cpp

tests/test_glib_source.cpp

tests/test_hud_controller.cpp

tests/test_icon_loader.cpp

tests/test_im_text_entry.cpp

tests/test_launcher.cpp

tests/test_launcher_controller.cpp

tests/test_launcher_hide_machine.cpp

tests/test_launcher_hover_machine.cpp

tests/test_launcher_icon.cpp

tests/test_layout_system.cpp

tests/test_mock_devices.h

tests/test_mock_filemanager.h

tests/test_overlay_scrollbar.cpp

tests/test_panel_menu_view.cpp

tests/test_panel_service.cpp

tests/test_panel_view.cpp

tests/test_resultviewgrid.cpp

tests/test_scope.cpp

tests/test_session_controller.cpp

tests/test_shortcut_controller.cpp

tests/test_shortcut_modeller_compiz.cpp

tests/test_single_monitor_launcher_icon.cpp

tests/test_software_center_launcher_icon.cpp

tests/test_switcher_controller.cpp

tests/test_switcher_controller.h

tests/test_switcher_controller_class.cpp

tests/test_switcher_view.cpp

tests/test_unity_window_view.cpp

tests/test_unityshell_private.cpp

tests/test_volume_imp.cpp

tests/test_volume_launcher_icon.cpp

tests/test_window_buttons.cpp

tests/test_xdnd_manager_imp.cpp

tools/unity.cmake

unity-shared/AnimationUtils-inl.h

unity-shared/AnimationUtils.h

unity-shared/BGHash.cpp

unity-shared/BGHash.h

unity-shared/BamfApplicationManager.cpp

unity-shared/FileManager.h

unity-shared/GnomeFileManager.cpp

unity-shared/GnomeFileManager.h

unity-shared/IconLoader.cpp

unity-shared/IconLoader.h

unity-shared/IconRenderer.cpp

unity-shared/IconTextureSource.cpp

unity-shared/IconTextureSource.h

unity-shared/JSONParser.cpp

unity-shared/OverlayRenderer.cpp

unity-shared/PlacesOverlayVScrollBar.cpp

unity-shared/PluginAdapter.cpp

unity-shared/StandaloneWindowManager.cpp

unity-shared/StandaloneWindowManager.h

unity-shared/StaticCairoText.cpp

unity-shared/TimeUtil.h

unity-shared/UBusMessages.h

unity-shared/UnityWindowView.cpp

unity-shared/VScrollBarOverlayWindow.cpp

unity-shared/VScrollBarOverlayWindow.h

unity-shared/WindowManager.h

unity-standalone/StandaloneUnity.cpp

Show diffs side-by-side

added added

removed removed

UnityCore/ActionHandle.h

UnityCore/CMakeLists.txt

UnityCore/ConnectionManager.h

UnityCore/GLibSource.cpp

UnityCore/GLibSource.h

UnityCore/Preview.cpp

UnityCore/Preview.h

UnityCore/Scope.cpp

UnityCore/Scope.h

UnityCore/ScopeProxy.cpp

UnityCore/ScopeProxyInterface.h

dash/DashController.cpp

dash/DashController.h

dash/DashView.cpp

dash/DashView.h

dash/ResultRendererTile.cpp

dash/ResultViewGrid.cpp

dash/ResultViewGrid.h

debian/changelog

debian/libunity-core-6.0-8.lintian-overrides

hud/HudController.cpp

hud/HudController.h

launcher/AbstractLauncherIcon.cpp

launcher/AbstractLauncherIcon.h

launcher/ApplicationLauncherIcon.cpp

launcher/ApplicationLauncherIcon.h

launcher/BFBLauncherIcon.cpp

launcher/CMakeLists.txt

launcher/CairoBaseWindow.cpp

launcher/CairoBaseWindow.h

launcher/DeltaTracker.cpp

launcher/DeltaTracker.h

launcher/DesktopLauncherIcon.cpp

launcher/DeviceLauncherSection.cpp

launcher/DeviceLauncherSection.h

launcher/DeviceNotificationDisplayImp.cpp

launcher/EdgeBarrierController.cpp

launcher/EdgeBarrierControllerPrivate.h

launcher/ExpoLauncherIcon.cpp

launcher/HudLauncherIcon.cpp

launcher/Launcher.cpp

launcher/Launcher.h

launcher/LauncherController.cpp

launcher/LauncherController.h

launcher/LauncherControllerPrivate.h

launcher/LauncherIcon.cpp

launcher/LauncherIcon.h

launcher/MockLauncherIcon.h

launcher/QuicklistManager.cpp

launcher/QuicklistManager.h

launcher/QuicklistView.cpp

launcher/QuicklistView.h

launcher/SimpleLauncherIcon.cpp

launcher/SingleMonitorLauncherIcon.cpp

launcher/SingleMonitorLauncherIcon.h

launcher/SoftwareCenterLauncherIcon.cpp

launcher/SpacerLauncherIcon.cpp

launcher/StandaloneLauncher.cpp

launcher/SwitcherController.cpp

launcher/SwitcherController.h

launcher/SwitcherControllerImpl.h

launcher/SwitcherView.cpp

launcher/SwitcherView.h

launcher/Tooltip.cpp

launcher/Tooltip.h

launcher/TrashLauncherIcon.cpp

launcher/Volume.h

launcher/VolumeImp.cpp

launcher/VolumeImp.h

launcher/VolumeLauncherIcon.cpp

launcher/VolumeLauncherIcon.h

launcher/XdndCollectionWindow.h

launcher/XdndCollectionWindowImp.cpp

launcher/XdndCollectionWindowImp.h

launcher/XdndManager.h

launcher/XdndManagerImp.cpp

launcher/XdndManagerImp.h

panel/PanelView.cpp

panel/PanelView.h

plugins/unityshell/src/UnityshellPrivate.cpp

plugins/unityshell/src/UnityshellPrivate.h

plugins/unityshell/src/unityshell.cpp

plugins/unityshell/src/unityshell.h

plugins/unityshell/unityshell.xml.in

services/panel-service-private.h

services/panel-service.c

shortcuts/ShortcutController.cpp

shortcuts/ShortcutController.h

shutdown/SessionController.cpp

shutdown/SessionController.h

tests/CMakeLists.txt

tests/autopilot/unity/emulators/__init__.py

tests/autopilot/unity/emulators/hud.py

tests/autopilot/unity/emulators/launcher.py

tests/autopilot/unity/emulators/screen.py

tests/autopilot/unity/emulators/switcher.py

tests/autopilot/unity/emulators/window_manager.py

tests/autopilot/unity/tests/__init__.py

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

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

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

tests/autopilot/unity/tests/test_panel.py

tests/autopilot/unity/tests/test_spread.py

tests/autopilot/unity/tests/test_switcher.py

tests/autopilot/unity/tests/test_wm_keybindings.py

tests/data/external.gschema.xml

tests/gmockvolume.c

tests/mock-application.h

tests/mock-base-window.h

tests/test_action_handle.cpp

tests/test_animation_utils.cpp

tests/test_application_launcher_icon.cpp

tests/test_bamf_application.cpp

tests/test_connection_manager.cpp

tests/test_dash_controller.cpp

tests/test_delta_tracker.cpp

tests/test_device_launcher_section.cpp

tests/test_expo_launcher_icon.cpp

tests/test_glib_source.cpp

tests/test_hud_controller.cpp

tests/test_icon_loader.cpp

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_launcher.cpp

tests/test_launcher_controller.cpp

tests/test_launcher_hide_machine.cpp

tests/test_launcher_hover_machine.cpp

tests/test_launcher_icon.cpp

tests/test_layout_system.cpp

tests/test_mock_devices.h

tests/test_mock_filemanager.h

tests/test_overlay_scrollbar.cpp

tests/test_panel_menu_view.cpp

tests/test_panel_service.cpp

tests/test_panel_view.cpp

tests/test_resultviewgrid.cpp

tests/test_scope.cpp

tests/test_session_controller.cpp

tests/test_shortcut_controller.cpp

tests/test_shortcut_modeller_compiz.cpp

tests/test_single_monitor_launcher_icon.cpp

tests/test_software_center_launcher_icon.cpp

tests/test_standalone_wm.h

tests/test_switcher_controller.cpp

tests/test_switcher_controller.h

tests/test_switcher_controller_class.cpp

tests/test_switcher_view.cpp

tests/test_unity_window_view.cpp

tests/test_unityshell_private.cpp

tests/test_volume_imp.cpp

tests/test_volume_launcher_icon.cpp

tests/test_window_buttons.cpp

tests/test_xdnd_manager_imp.cpp

tools/unity.cmake

unity-shared/AnimationUtils-inl.h

unity-shared/AnimationUtils.h

unity-shared/BGHash.cpp

unity-shared/BGHash.h

unity-shared/BamfApplicationManager.cpp

unity-shared/FileManager.h

unity-shared/GnomeFileManager.cpp

unity-shared/GnomeFileManager.h

unity-shared/IconLoader.cpp

unity-shared/IconLoader.h

unity-shared/IconRenderer.cpp

unity-shared/IconTextureSource.cpp

unity-shared/IconTextureSource.h

unity-shared/JSONParser.cpp

unity-shared/OverlayRenderer.cpp

unity-shared/PlacesOverlayVScrollBar.cpp

unity-shared/PluginAdapter.cpp

unity-shared/StandaloneWindowManager.cpp

unity-shared/StandaloneWindowManager.h

unity-shared/StaticCairoText.cpp

unity-shared/TimeUtil.h

unity-shared/UBusMessages.h

unity-shared/UnityWindowView.cpp

unity-shared/VScrollBarOverlayWindow.cpp

unity-shared/VScrollBarOverlayWindow.h

unity-shared/WindowManager.h

unity-standalone/StandaloneUnity.cpp

Older »