Merge lp://staging/~schumski-deactivatedaccount-deactivatedaccount/ubuntu/quantal/kmess/1045090 into lp://staging/ubuntu/quantal/kmess
Proposed by
šumski
| Status: | Work in progress |
|---|---|
| Proposed branch: | lp://staging/~schumski-deactivatedaccount-deactivatedaccount/ubuntu/quantal/kmess/1045090 |
| Merge into: | lp://staging/ubuntu/quantal/kmess |
| Diff against target: |
500 lines (+436/-0) (has conflicts) 12 files modified
debian/changelog (+181/-0) debian/compat (+1/-0) debian/control (+23/-0) debian/copyright (+50/-0) debian/docs (+1/-0) debian/kmess.1 (+139/-0) debian/kmess.menu (+5/-0) debian/patches/qdelete.diff (+15/-0) debian/patches/series (+1/-0) debian/rules (+13/-0) debian/source/format (+1/-0) debian/watch (+6/-0) Conflict adding file debian. Moved existing file to debian.moved. |
| To merge this branch: | bzr merge lp://staging/~schumski-deactivatedaccount-deactivatedaccount/ubuntu/quantal/kmess/1045090 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Jamie Strandboge | Needs Information | ||
| Ubuntu branches | Pending | ||
|
Review via email:
|
|||
Description of the change
* New upstream release
* Add upstream's commit for fixing crashes with newer Qt
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
As mentioned in bug #1045090, this needs an FFe before it can be considered.