Merge lp:~sil2100/unity/unity-dash-legal-6.0 into lp:unity/6.0
Proposed by
Łukasz Zemczak
Status: | Merged | ||||||||
---|---|---|---|---|---|---|---|---|---|
Approved by: | Francis Ginther | ||||||||
Approved revision: | no longer in the source branch. | ||||||||
Merged at revision: | 2785 | ||||||||
Proposed branch: | lp:~sil2100/unity/unity-dash-legal-6.0 | ||||||||
Merge into: | lp:unity/6.0 | ||||||||
Diff against target: |
304 lines (+138/-8) 6 files modified
dash/LensBar.cpp (+94/-5) dash/LensBar.h (+19/-2) plugins/unityshell/resources/information_icon.svg (+14/-0) plugins/unityshell/resources/searchingthedashlegalnotice.html (+1/-0) unity-shared/DashStyle.cpp (+7/-0) unity-shared/DashStyle.h (+3/-1) |
||||||||
To merge this branch: | bzr merge lp:~sil2100/unity/unity-dash-legal-6.0 | ||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Marco Trevisan (Treviño) | Approve | ||
Review via email: mp+129892@code.launchpad.net |
Commit message
Cherry-picked gord's legal branch: adds a legal link to the dash, also a new resource
Description of the change
Cherry picked https:/
adds a legal link to the dash
To post a comment you must log in.
Just a comment - this branch has been decided to be 'ready for 6.0' - 7.0 work will probably need a bit more love.