← Back to branch summary

~gordallott/unity/newbg

~gordallott/unity/newbg

Viewing all changes in revision 2419.4.84.

Committer: Nick Dedekind
Date: 2012-08-22 08:16:02 UTC
mfrom: (2604 unity)
mto: This revision was merged to the branch mainline in revision 2606.
Revision ID: nicholas.dedekind@gmail.com-20120822081602-y3mx47o9aosw345x

Merge with trunk

files added:
dash/CoverflowResultView.cpp

dash/CoverflowResultView.h

manual-tests/Flowview.txt

plugins/unityshell/src/CompoundGestureRecognizer.cpp

plugins/unityshell/src/CompoundGestureRecognizer.h

plugins/unityshell/src/GesturalWindowSwitcher.cpp

plugins/unityshell/src/GesturalWindowSwitcher.h

tests/test-gestures/GesturalWindowSwitcherMock.h

tests/test-gestures/SwitcherControllerMock.h

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

tests/test-gestures/sed_script_switcher

tests/test-gestures/test_compound_gesture_recognizer.cpp

tests/test-gestures/test_gestural_window_switcher.cpp

files removed:
manual-tests/HighlightedBFB.txt

files modified:
UnityCore/Hud.cpp

dash/CMakeLists.txt

dash/LensView.cpp *

dash/PlacesGroup.cpp *

dash/PlacesGroup.h

dash/previews/ApplicationPreview.cpp

dash/previews/GenericPreview.cpp

dash/previews/MoviePreview.cpp

dash/previews/MusicPreview.cpp

dash/previews/Preview.cpp

dash/previews/Preview.h

hud/HudIcon.cpp

hud/HudIcon.h

hud/HudView.cpp

launcher/SwitcherController.cpp

launcher/SwitcherController.h

launcher/SwitcherView.cpp

launcher/SwitcherView.h

manual-tests/Dash.txt

manual-tests/Hud.txt

plugins/networkarearegion/src/networkarearegion.cpp

plugins/unityshell/src/ScreenEffectFramebufferObject.cpp

plugins/unityshell/src/UnityGestureBroker.cpp

plugins/unityshell/src/UnityGestureBroker.h

plugins/unityshell/src/UnityGestureTarget.cpp

plugins/unityshell/src/WindowGestureTarget.cpp

plugins/unityshell/src/unityshell.cpp

plugins/unityshell/src/unityshell.h

tests/autopilot/unity/tests/test_dash.py

tests/autopilot/unity/tests/test_hud.py

tests/autopilot/unity/tests/test_ibus.py

tests/autopilot/unity/tests/test_shortcut_hint.py

tests/test-gestures/CMakeLists.txt

tests/test-gestures/NuxMock.h

tests/test-gestures/sed_script_broker

tests/test-gestures/test_gestures_main.cpp

tests/test-gestures/unityshell_mock.h

tests/test_icon_loader.cpp

tests/test_thumbnail_generator.cpp

unity-shared/CoverArt.cpp

unity-shared/CoverArt.h

unity-shared/DashStyle.cpp *

unity-shared/DashStyle.h *

unity-shared/IconLoader.cpp

unity-shared/IconRenderer.cpp

unity-shared/ThumbnailGenerator.cpp

Show diffs side-by-side

added added

removed removed

UnityCore/Hud.cpp

dash/CMakeLists.txt

dash/CoverflowResultView.cpp

dash/CoverflowResultView.h

dash/LensView.cpp

dash/PlacesGroup.cpp

dash/PlacesGroup.h

dash/previews/ApplicationPreview.cpp

dash/previews/GenericPreview.cpp

dash/previews/MoviePreview.cpp

dash/previews/MusicPreview.cpp

dash/previews/Preview.cpp

dash/previews/Preview.h

hud/HudIcon.cpp

hud/HudView.cpp

launcher/SwitcherController.cpp

launcher/SwitcherController.h

launcher/SwitcherView.cpp

launcher/SwitcherView.h

manual-tests/Dash.txt

manual-tests/Flowview.txt

manual-tests/HighlightedBFB.txt

manual-tests/Hud.txt

plugins/networkarearegion/src/networkarearegion.cpp

plugins/unityshell/src/CompoundGestureRecognizer.cpp

plugins/unityshell/src/CompoundGestureRecognizer.h

plugins/unityshell/src/GesturalWindowSwitcher.cpp

plugins/unityshell/src/GesturalWindowSwitcher.h

plugins/unityshell/src/ScreenEffectFramebufferObject.cpp

plugins/unityshell/src/UnityGestureBroker.cpp

plugins/unityshell/src/UnityGestureBroker.h

plugins/unityshell/src/UnityGestureTarget.cpp

plugins/unityshell/src/WindowGestureTarget.cpp

plugins/unityshell/src/unityshell.cpp

plugins/unityshell/src/unityshell.h

tests/autopilot/unity/tests/test_dash.py

tests/autopilot/unity/tests/test_hud.py

tests/autopilot/unity/tests/test_ibus.py

tests/autopilot/unity/tests/test_shortcut_hint.py

tests/test-gestures/CMakeLists.txt

tests/test-gestures/GesturalWindowSwitcherMock.h

tests/test-gestures/NuxMock.h

tests/test-gestures/SwitcherControllerMock.h

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

tests/test-gestures/sed_script_broker

tests/test-gestures/sed_script_switcher

tests/test-gestures/test_compound_gesture_recognizer.cpp

tests/test-gestures/test_gestural_window_switcher.cpp

tests/test-gestures/test_gestures_main.cpp

tests/test-gestures/unityshell_mock.h

tests/test_icon_loader.cpp

tests/test_thumbnail_generator.cpp

unity-shared/CoverArt.cpp

unity-shared/CoverArt.h

unity-shared/IconLoader.cpp

unity-shared/IconRenderer.cpp

unity-shared/ThumbnailGenerator.cpp

Older »