Merge lp://staging/~voldyman/xkcdv/manager-class into lp://staging/xkcdv
Proposed by
lacthiea
| Status: | Merged |
|---|---|
| Merged at revision: | 48 |
| Proposed branch: | lp://staging/~voldyman/xkcdv/manager-class |
| Merge into: | lp://staging/xkcdv |
| Diff against target: |
216 lines (+82/-28) (has conflicts) 2 files modified
src/ComicDataManager.vala (+52/-14) src/xkcdV.vala (+30/-14) Text conflict in src/ComicDataManager.vala Text conflict in src/xkcdV.vala |
| To merge this branch: | bzr merge lp://staging/~voldyman/xkcdv/manager-class |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| lacthiea | Pending | ||
|
Review via email:
|
|||
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
