← Back to branch summary

~unity-team/unity/autohide-load-934514

~unity-team/unity/autohide-load-934514

Viewing all changes in revision 2531.

Committer: Bilal Akhtar
Date: 2012-08-08 03:03:35 UTC
mfrom: (2529.2.11 unity)
Revision ID: bilalakhtar@ubuntu.com-20120808030335-elmp8h9cib1yoqr1

Merge from trunk

files added:
plugins/unityshell/src/UnityGestureTarget.cpp

plugins/unityshell/src/UnityGestureTarget.h

plugins/unityshell/src/WindowGestureTarget.cpp

plugins/unityshell/src/WindowGestureTarget.h

tests/test-gestures/FakeGestureEvent.h

tests/test-gestures/NuxMock.h

tests/test-gestures/UnityGestureTargetMock.h

tests/test-gestures/WindowGestureTargetMock.h

tests/test-gestures/sed_script_gesture

tests/test-gestures/test_gestures_main.cpp

tests/test-gestures/test_window_gesture_target.cpp

tests/test-gestures/unityshell_mock.h

tests/test_panel_style.cpp

files removed:
launcher/GeisAdapter.cpp

launcher/GeisAdapter.h

tests/test-gesture-engine/GeisAdapterMock.cpp

tests/test-gesture-engine/GeisAdapterMock.h

files renamed:
plugins/unityshell/src/GestureEngine.cpp => plugins/unityshell/src/UnityGestureBroker.cpp

plugins/unityshell/src/GestureEngine.h => plugins/unityshell/src/UnityGestureBroker.h

tests/test-gesture-engine/ => tests/test-gestures/

tests/test-gesture-engine/sed_script => tests/test-gestures/sed_script_broker

tests/test-gesture-engine/test_gesture_engine.cpp => tests/test-gestures/test_gesture_broker.cpp

files modified:
CMakeLists.txt

HACKING

UnityCore/CMakeLists.txt

UnityCore/HomeLens.cpp

dash/ResultView.cpp

dash/ResultViewGrid.cpp

launcher/CMakeLists.txt

launcher/FavoriteStoreGSettings.cpp

launcher/FavoriteStoreGSettings.h

launcher/Launcher.cpp

launcher/Launcher.h

launcher/LauncherController.cpp

launcher/LauncherModel.cpp

launcher/StandaloneLauncher.cpp

launcher/SwitcherController.cpp

manual-tests/Launcher.txt

panel/PanelIndicatorEntryView.cpp

panel/PanelMenuView.cpp

plugins/unity-mt-grab-handles/src/unity-mt-grab-handles.cpp

plugins/unitydialog/src/unitydialog.cpp

plugins/unityshell/CMakeLists.txt

plugins/unityshell/src/nux-layout-accessible.cpp

plugins/unityshell/src/unity-launcher-accessible.cpp

plugins/unityshell/src/unity-switcher-accessible.cpp

plugins/unityshell/src/unityshell.cpp

plugins/unityshell/src/unityshell.h

services/panel-main.c

tests/CMakeLists.txt

tests/test-gestures/CMakeLists.txt

tests/test-gestures/compiz_mock/core/screen.h

tests/test-gestures/compiz_mock/core/window.h

tests/test_favorite_store_gsettings.cpp

tests/test_launcher_controller.cpp

tests/test_main.cpp

tests/test_switcher_controller.cpp

unity-shared/BGHash.cpp

unity-shared/DashStyle.cpp

unity-shared/IconRenderer.cpp

unity-shared/PanelStyle.cpp

unity-shared/PanelStyle.h

unity-shared/PluginAdapterCompiz.cpp

unity-standalone/StandaloneUnity.cpp

Show diffs side-by-side

added added

removed removed

UnityCore/CMakeLists.txt

UnityCore/HomeLens.cpp

dash/ResultView.cpp

dash/ResultViewGrid.cpp

launcher/CMakeLists.txt

launcher/FavoriteStoreGSettings.cpp

launcher/FavoriteStoreGSettings.h

launcher/GeisAdapter.cpp

launcher/GeisAdapter.h

launcher/Launcher.cpp

launcher/Launcher.h

launcher/LauncherController.cpp

launcher/LauncherModel.cpp

launcher/StandaloneLauncher.cpp

launcher/SwitcherController.cpp

manual-tests/Launcher.txt

panel/PanelIndicatorEntryView.cpp

panel/PanelMenuView.cpp

plugins/unity-mt-grab-handles/src/unity-mt-grab-handles.cpp

plugins/unitydialog/src/unitydialog.cpp

plugins/unityshell/CMakeLists.txt

plugins/unityshell/src/UnityGestureBroker.cpp

plugins/unityshell/src/UnityGestureBroker.h

plugins/unityshell/src/UnityGestureTarget.cpp

plugins/unityshell/src/UnityGestureTarget.h

plugins/unityshell/src/WindowGestureTarget.cpp

plugins/unityshell/src/WindowGestureTarget.h

plugins/unityshell/src/nux-layout-accessible.cpp

plugins/unityshell/src/unity-launcher-accessible.cpp

plugins/unityshell/src/unity-switcher-accessible.cpp

plugins/unityshell/src/unityshell.cpp

plugins/unityshell/src/unityshell.h

services/panel-main.c

tests/CMakeLists.txt

tests/test-gesture-engine/GeisAdapterMock.cpp

tests/test-gesture-engine/GeisAdapterMock.h

tests/test-gestures/CMakeLists.txt

tests/test-gestures/FakeGestureEvent.h

tests/test-gestures/NuxMock.h

tests/test-gestures/UnityGestureTargetMock.h

tests/test-gestures/WindowGestureTargetMock.h

tests/test-gestures/compiz_mock/core/screen.h

tests/test-gestures/compiz_mock/core/window.h

tests/test-gestures/sed_script_broker

tests/test-gestures/sed_script_gesture

tests/test-gestures/test_gesture_broker.cpp

tests/test-gestures/test_gestures_main.cpp

tests/test-gestures/test_window_gesture_target.cpp

tests/test-gestures/unityshell_mock.h

tests/test_favorite_store_gsettings.cpp

tests/test_launcher_controller.cpp

tests/test_main.cpp

tests/test_panel_style.cpp

tests/test_switcher_controller.cpp

unity-shared/BGHash.cpp

unity-shared/DashStyle.cpp

unity-shared/IconRenderer.cpp

unity-shared/PanelStyle.cpp

unity-shared/PanelStyle.h

unity-shared/PluginAdapterCompiz.cpp

unity-standalone/StandaloneUnity.cpp

Older »