← Back to branch summary

~ubuntu-branches/ubuntu/wily/unity/wily

~ubuntu-branches/ubuntu/wily/unity/wily

Viewing all changes in revision 55.2212.3.

Committer: Daniel van Vugt
Date: 2012-09-13 10:56:42 UTC
mfrom: (55.2146.52 unity)
mto: (55.2146.66 unity)
mto: This revision was merged to the branch mainline in revision 782.
Revision ID: daniel.van.vugt@canonical.com-20120913105642-9on2ald55h54j1zn

Merge latest lp:unity and fix conflicts

files added:
plugins/unityshell/resources/lens-nav-gwibber.svg

files removed:
plugins/unityshell/src/ScreenEffectFramebufferObject.cpp

plugins/unityshell/src/ScreenEffectFramebufferObject.h

files modified:
CMakeLists.txt

HACKING

UnityCore/Preview.cpp

UnityCore/Preview.h

dash/CoverflowResultView.cpp

dash/DashController.cpp

dash/DashController.h

dash/DashView.cpp

dash/LensBar.cpp

dash/PlacesGroup.cpp

dash/previews/ActionButton.cpp

dash/previews/PreviewContainer.cpp

dash/previews/Track.cpp

dash/previews/Track.h

hud/HudController.cpp

hud/HudController.h

hud/HudView.cpp

launcher/EdgeBarrierController.cpp

launcher/LauncherController.cpp

launcher/SwitcherController.cpp

manual-tests/Dash.txt

manual-tests/Launcher.txt

manual-tests/Preview.txt

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

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

plugins/unitydialog/src/unitydialog.cpp

plugins/unitydialog/src/unitydialog.h

plugins/unityshell/resources/lens-nav-app.svg

plugins/unityshell/resources/lens-nav-file.svg

plugins/unityshell/resources/lens-nav-home.svg

plugins/unityshell/resources/lens-nav-music.svg

plugins/unityshell/resources/lens-nav-photo.svg

plugins/unityshell/resources/lens-nav-video.svg

plugins/unityshell/src/unitya11y.cpp

plugins/unityshell/src/unityshell.cpp

plugins/unityshell/src/unityshell.h

services/CMakeLists.txt

services/panel-a11y.c

tests/autopilot/unity/emulators/dash.py

tests/autopilot/unity/emulators/hud.py

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

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

tests/autopilot/unity/tests/test_dash.py

tests/autopilot/unity/tests/test_hud.py

tests/test_edge_barrier_controller.cpp

tests/test_previews.cpp

unity-shared/PreviewStyle.cpp

Show diffs side-by-side

added added

removed removed

UnityCore/Preview.cpp

UnityCore/Preview.h

dash/CoverflowResultView.cpp

dash/DashController.cpp

dash/DashController.h

dash/DashView.cpp

dash/LensBar.cpp

dash/PlacesGroup.cpp

dash/previews/ActionButton.cpp

dash/previews/PreviewContainer.cpp

dash/previews/Track.cpp

dash/previews/Track.h

hud/HudController.cpp

hud/HudController.h

hud/HudView.cpp

launcher/EdgeBarrierController.cpp

launcher/LauncherController.cpp

launcher/SwitcherController.cpp

manual-tests/Dash.txt

manual-tests/Launcher.txt

manual-tests/Preview.txt

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

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

plugins/unitydialog/src/unitydialog.cpp

plugins/unitydialog/src/unitydialog.h

plugins/unityshell/resources/lens-nav-app.svg

plugins/unityshell/resources/lens-nav-file.svg

plugins/unityshell/resources/lens-nav-gwibber.svg

plugins/unityshell/resources/lens-nav-home.svg

plugins/unityshell/resources/lens-nav-music.svg

plugins/unityshell/resources/lens-nav-photo.svg

plugins/unityshell/resources/lens-nav-video.svg

plugins/unityshell/src/ScreenEffectFramebufferObject.cpp

plugins/unityshell/src/ScreenEffectFramebufferObject.h

plugins/unityshell/src/unitya11y.cpp

plugins/unityshell/src/unityshell.cpp

plugins/unityshell/src/unityshell.h

services/CMakeLists.txt

tests/autopilot/unity/emulators/dash.py

tests/autopilot/unity/emulators/hud.py

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

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

tests/autopilot/unity/tests/test_dash.py

tests/autopilot/unity/tests/test_hud.py

tests/test_edge_barrier_controller.cpp

tests/test_previews.cpp

unity-shared/PreviewStyle.cpp

Older »