Merge lp://qastaging/~unity-team/unity/fixes-2011-04-14 into lp://qastaging/unity
Proposed by
Neil J. Patel
| Status: | Merged |
|---|---|
| Approved by: | Mirco Müller |
| Approved revision: | no longer in the source branch. |
| Merged at revision: | 1138 |
| Proposed branch: | lp://qastaging/~unity-team/unity/fixes-2011-04-14 |
| Merge into: | lp://qastaging/unity |
| Diff against target: |
158 lines (+44/-6) (has conflicts) 6 files modified
src/PanelMenuView.cpp (+18/-3) src/PanelView.cpp (+2/-3) src/PlacesEmptyView.cpp (+3/-0) src/PlacesView.cpp (+15/-0) src/PlacesView.h (+5/-0) src/PluginAdapter.cpp (+1/-0) Text conflict in src/PlacesView.cpp Text conflict in src/PlacesView.h |
| To merge this branch: | bzr merge lp://qastaging/~unity-team/unity/fixes-2011-04-14 |
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Mirco Müller (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
Bugs linked
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Approve.