← Back to branch summary

~smspillaz/unity/4.0_fix_912682

~smspillaz/unity/4.0_fix_912682

Viewing all changes in revision 1727.

Committer: David Barth
Date: 2012-01-05 11:04:31 UTC
mfrom: (1720.3.2 4.0-oneiric-dash-custom-home-screen)
Revision ID: david.barth@canonical.com-20120105110431-p3i3zuvycgcms7x3

https://launchpad.net/bugs/785840

Merge custom dash patch (#785840)

files added:
manual-tests

manual-tests/custom-dash-home

manual-tests/custom-dash-home/HomeShortcutsCustomized-4-entries.json

manual-tests/custom-dash-home/HomeShortcutsCustomized-8-entries.json

manual-tests/custom-dash-home/HomeShortcutsCustomized-broken.json

manual-tests/custom-dash-home/custom-dash-home.txt

manual-tests/launcher.txt

files removed:
manual-tests

manual-tests/launcher.txt

files modified:
plugins/unityshell/src/JSONParser.cpp

plugins/unityshell/src/JSONParser.h

plugins/unityshell/src/PlacesHomeView.cpp

plugins/unityshell/src/PlacesHomeView.h

Show diffs side-by-side

added added

removed removed

manual-tests/custom-dash-home/

manual-tests/custom-dash-home/HomeShortcutsCustomized-4-entries.json

manual-tests/custom-dash-home/HomeShortcutsCustomized-8-entries.json

manual-tests/custom-dash-home/HomeShortcutsCustomized-broken.json

manual-tests/custom-dash-home/custom-dash-home.txt

manual-tests/launcher.txt

manual-tests/launcher.txt

plugins/unityshell/src/JSONParser.cpp

plugins/unityshell/src/JSONParser.h

plugins/unityshell/src/PlacesHomeView.cpp

plugins/unityshell/src/PlacesHomeView.h

Older »