Merge lp://qastaging/~indicator-applet-developers/libindicator/ubuntu into lp://qastaging/~ubuntu-desktop/libindicator/ubuntu
Proposed by
Ted Gould
| Status: | Merged | ||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| Merged at revision: | 362 | ||||||||||||||||||||||||||||
| Proposed branch: | lp://qastaging/~indicator-applet-developers/libindicator/ubuntu | ||||||||||||||||||||||||||||
| Merge into: | lp://qastaging/~ubuntu-desktop/libindicator/ubuntu | ||||||||||||||||||||||||||||
| Diff against target: |
221 lines (+60/-13) (has conflicts) 9 files modified
ChangeLog (+23/-0) Makefile.am (+4/-0) Makefile.in (+4/-0) configure (+10/-10) configure.ac (+1/-1) debian/changelog (+11/-0) libindicator/Makefile.am (+1/-1) libindicator/Makefile.in (+1/-1) libindicator/indicator-image-helper.c (+5/-0) Text conflict in debian/changelog |
||||||||||||||||||||||||||||
| To merge this branch: | bzr merge lp://qastaging/~indicator-applet-developers/libindicator/ubuntu | ||||||||||||||||||||||||||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ken VanDine | Pending | ||
|
Review via email:
|
|||
Description of the change
Fix for icon loading with qt-sni
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
