Viewing all changes in revision 928.
- Committer: Gerry Boland
- Date: 2012-03-13 22:19:10 UTC
- mfrom: (925.1.61 unity-2d)
- Revision ID: gerry.boland@canonical.com-20120313221910-7shd08mdzqydimrc
Merge trunk
- files added:
- HACKING.txt
- shell/hud
- tests/hud
- files removed:
- data/unity-2d.convert
- files renamed:
- debian/unity-2d.install.in => debian/unity-2d-common.install.in
- debian/unity-2d.postinst.in => debian/unity-2d-common.postinst.in
- debian/unity-2d.postrm.in => debian/unity-2d-common.postrm.in
- debian/unity-2d.triggers.in => debian/unity-2d-common.triggers.in
- shell/dash/artwork/panel_border.png => shell/common/artwork/panel_border.png
- files modified:
- CMakeLists.txt
expand all
collapse all
added
removed
panel/applets/appname/artwork/maximize_dash_disabled.png
shell/common/artwork/desktop_dash_background.png
shell/common/artwork/desktop_dash_background_no_transparency.png
shell/common/artwork/search_background.png
shell/common/artwork/search_icon.png
shell/dash/artwork/find_files.png
shell/dash/artwork/find_internet_apps.png
shell/dash/artwork/find_media_apps.png
shell/dash/artwork/find_more_apps.png
shell/launcher/artwork/launcher_arrow_ltr.png
shell/launcher/artwork/launcher_arrow_outline_ltr.png
shell/launcher/artwork/launcher_arrow_rtl.png
shell/launcher/artwork/launcher_pip_ltr.png
tests/launcher/verification/dash-tile.png
tests/panel/verification/close_dash.png
tests/panel/verification/close_dash_prelight.png
tests/panel/verification/close_dash_pressed.png
tests/panel/verification/maximize_dash.png
tests/panel/verification/maximize_dash_prelight.png
tests/panel/verification/maximize_dash_pressed.png
tests/panel/verification/minimize_dash.png
tests/panel/verification/unmaximize_dash.png
tests/panel/verification/unmaximize_dash_prelight.png
tests/panel/verification/unmaximize_dash_pressed.png
tests/shell/verification/dash_collapsed.png
tests/shell/verification/dash_desktop.png
