← Back to branch summary

~ted/unity/menu-ref

~ted/unity/menu-ref

Viewing all changes in revision 2571.4.2.

Committer: Daniel van Vugt
Date: 2012-08-17 07:28:10 UTC
mfrom: (2577 unity)
mto: This revision was merged to the branch mainline in revision 2586.
Revision ID: daniel.van.vugt@canonical.com-20120817072810-ug10hr6x6jb4dyli

Merge latest lp:unity

files added:
dash/PreviewStateMachine.cpp

dash/PreviewStateMachine.h

tools/convert-files

tools/convert-files/compiz-profile-active-unity.convert

tools/convert-files/compiz-profile-unity.convert

files modified:
dash/CMakeLists.txt

dash/DashController.cpp

dash/DashView.cpp

dash/DashView.h

dash/LensView.cpp

dash/LensView.h

dash/ResultView.cpp

dash/ResultView.h

dash/ResultViewGrid.cpp

dash/ResultViewGrid.h

dash/StandaloneDash.cpp

dash/previews/PreviewContainer.h

plugins/unityshell/src/unityshell.cpp

plugins/unityshell/src/unityshell.h

po/POTFILES.in

tests/autopilot/unity/emulators/dash.py

tests/autopilot/unity/tests/test_dash.py

tests/test_lens.cpp

tests/test_service_lens.c

unity-shared/DashStyle.cpp

unity-shared/UBusMessages.h

Show diffs side-by-side

added added

removed removed

dash/CMakeLists.txt

dash/DashController.cpp

dash/DashView.cpp

dash/DashView.h

dash/LensView.cpp

dash/LensView.h

dash/PreviewStateMachine.cpp

dash/PreviewStateMachine.h

dash/ResultView.cpp

dash/ResultView.h

dash/ResultViewGrid.cpp

dash/ResultViewGrid.h

dash/StandaloneDash.cpp

dash/previews/PreviewContainer.h

plugins/unityshell/src/unityshell.cpp

plugins/unityshell/src/unityshell.h

tests/autopilot/unity/emulators/dash.py

tests/autopilot/unity/tests/test_dash.py

tests/test_lens.cpp

tests/test_service_lens.c

tools/convert-files/

tools/convert-files/compiz-profile-active-unity.convert

tools/convert-files/compiz-profile-unity.convert

unity-shared/DashStyle.cpp

unity-shared/UBusMessages.h

Older »