Merge lp://qastaging/adium-theme-ubuntu into lp://qastaging/~tkluck/adium-theme-ubuntu/adium-theme-ubuntu
Proposed by
Timo Kluck
| Status: | Needs review | ||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| Proposed branch: | lp://qastaging/adium-theme-ubuntu | ||||||||||||||||||||||||||||
| Merge into: | lp://qastaging/~tkluck/adium-theme-ubuntu/adium-theme-ubuntu | ||||||||||||||||||||||||||||
| Diff against target: |
83 lines (+18/-4) 6 files modified
setup.py (+2/-4) ubuntu.AdiumMessageStyle/Contents/Resources/Incoming/NextContent.html (+1/-0) ubuntu.AdiumMessageStyle/Contents/Resources/Incoming/NextContext.html (+1/-0) ubuntu.AdiumMessageStyle/Contents/Resources/Outgoing/NextContent.html (+1/-0) ubuntu.AdiumMessageStyle/Contents/Resources/Outgoing/NextContext.html (+1/-0) ubuntu.AdiumMessageStyle/Contents/Resources/Template.html (+12/-0) |
||||||||||||||||||||||||||||
| To merge this branch: | bzr merge lp://qastaging/adium-theme-ubuntu | ||||||||||||||||||||||||||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Timo Kluck | Pending | ||
|
Review via email:
|
|||
Description of the change
Hi there!
I noticed a few visual bugs in the chat history in empathy's conversation view. I traced this down to an issue with prepending messages. The commit+message should be fairly self-explanatory.
Thanks for taking the time to have a look.
To post a comment you must log in.
Revision history for this message
| Timo Kluck (tkluck) wrote | # |
Unmerged revisions
- 20. By Ken VanDine
-
Manually merged in patches already uploaded to yakety thanks to Andrew Shadura
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Haha, of course I meant to propose the reverse merge! :) I'll leave this here for now to save a few status change emails; but do let me know if you prefer that I remove this merge proposal and create a new one.