Viewing all changes in revision 2682.1.4.
- Committer: Brandon Schaefer
- Date: 2012-09-19 07:09:26 UTC
- mfrom: (2713 unity)
- mto: This revision was merged to the branch mainline in revision 2717.
- Revision ID: brandon.schaefer@canonical.com-20120919070926-j6dy5b8ghnqv7e6p
* merged trunk
- files added:
- UnityCore/SocialPreview.cpp
- tests/data/applications
- files renamed:
- tests/data/bzr-handle-patch.desktop => tests/data/applications/bzr-handle-patch.desktop
- tests/data/no-icon.desktop => tests/data/applications/no-icon.desktop
- tests/data/ubuntu-software-center.desktop => tests/data/applications/ubuntu-software-center.desktop
- tests/data/ubuntuone-installer.desktop => tests/data/applications/ubuntuone-installer.desktop
- tests/data/update-manager.desktop => tests/data/applications/update-manager.desktop
- tests/test_bamflaunchericon.cpp => tests/test_bamf_launcher_icon.cpp
- files modified:
- CMakeLists.txt
expand all
collapse all
added
removed
plugins/unityshell/resources/album_missing.png
plugins/unityshell/resources/album_missing_preview.png
plugins/unityshell/resources/category_gradient.png
plugins/unityshell/resources/category_gradient_no_refine.png
plugins/unityshell/resources/emblem_apps.svg
plugins/unityshell/resources/emblem_books.svg
plugins/unityshell/resources/emblem_clothes.svg
plugins/unityshell/resources/emblem_music.svg
plugins/unityshell/resources/emblem_video.svg
plugins/unityshell/resources/refine_gradient.png
plugins/unityshell/resources/refine_gradient_corner.png
plugins/unityshell/resources/refine_gradient_dash.png
plugins/unityshell/resources/refine_gradient_dash_no_refine.png
plugins/unityshell/resources/refine_gradient_no_refine_dash.png
plugins/unityshell/resources/refine_gradient_panel.png
plugins/unityshell/resources/refine_gradient_panel_no_refine.png
plugins/unityshell/resources/refine_gradient_panel_single_column.png
plugins/unityshell/resources/video_missing.png
