Merge lp:~brandontschaefer/unity/one-trash-can into lp:unity
Proposed by
Brandon Schaefer
Status: | Work in progress |
---|---|
Proposed branch: | lp:~brandontschaefer/unity/one-trash-can |
Merge into: | lp:unity |
Diff against target: |
209 lines (+137/-4) (has conflicts) 3 files modified
launcher/LauncherController.cpp (+56/-0) launcher/TrashLauncherIcon.cpp (+64/-4) launcher/TrashLauncherIcon.h (+17/-0) Text conflict in launcher/LauncherController.cpp Text conflict in launcher/TrashLauncherIcon.cpp Text conflict in launcher/TrashLauncherIcon.h |
To merge this branch: | bzr merge lp:~brandontschaefer/unity/one-trash-can |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Unity Team | Pending | ||
Review via email: mp+143377@code.launchpad.net |
To post a comment you must log in.
Unmerged revisions
- 2464. By Brandon Schaefer
-
* Only one trash can will open now