Viewing all changes in revision 1278.4.4.
- Committer: Gord Allott
- Date: 2011-08-01 14:44:09 UTC
- mfrom: (1323 unity)
- mto: This revision was merged to the branch mainline in revision 1332.
- Revision ID: gord.allott@canonical.com-20110801144409-xy5xmbj5ba87w1n1
small change to make conflict go away
- files added:
- UnityCore/FilesystemLenses.cpp
- guides
- tests/data/lenses
- tests/data/lenses/applications
- tests/data/lenses/empty
- tests/data/lenses/files
- tests/data/lenses/invalid-lens-file
- tests/data/lenses/invalid-lens-group
- tests/data/lenses/social
- files removed:
- UnityCore/UnityCore.h
- files modified:
- AUTHOR-glue
expand all
collapse all
added
removed
plugins/unityshell/resources/dash_bottom_border_tile.png
plugins/unityshell/resources/dash_bottom_right_corner.png
plugins/unityshell/resources/dash_right_border_tile.png
plugins/unityshell/resources/launcher_icon_back_150.png
plugins/unityshell/resources/launcher_icon_back_170.png
plugins/unityshell/resources/launcher_icon_back_54.png
plugins/unityshell/resources/launcher_icon_edge_150.png
plugins/unityshell/resources/launcher_icon_edge_170.png
plugins/unityshell/resources/launcher_icon_edge_54.png
plugins/unityshell/resources/launcher_icon_glow_200.png
plugins/unityshell/resources/launcher_icon_glow_62.png
plugins/unityshell/resources/launcher_icon_selected_back_150.png
plugins/unityshell/resources/launcher_icon_selected_back_170.png
plugins/unityshell/resources/launcher_icon_selected_edge_150.png
plugins/unityshell/resources/launcher_icon_selected_edge_170.png
plugins/unityshell/resources/launcher_icon_shine_150.png
plugins/unityshell/resources/launcher_icon_shine_170.png
plugins/unityshell/resources/launcher_icon_shine_54.png
plugins/unityshell/resources/switcher_background.png
