Merge lp://staging/~bzoltan/qtcreator-plugin-ubuntu/binary-plugin_fixed_build_deps into lp://staging/~ubuntu-sdk-team/qtcreator-plugin-ubuntu/binary-plugin
Proposed by
Zoltan Balogh
| Status: | Merged |
|---|---|
| Merged at revision: | 37 |
| Proposed branch: | lp://staging/~bzoltan/qtcreator-plugin-ubuntu/binary-plugin_fixed_build_deps |
| Merge into: | lp://staging/~ubuntu-sdk-team/qtcreator-plugin-ubuntu/binary-plugin |
| Diff against target: |
51 lines (+23/-2) (has conflicts) 2 files modified
debian/changelog (+5/-2) debian/control (+18/-0) Text conflict in debian/control |
| To merge this branch: | bzr merge lp://staging/~bzoltan/qtcreator-plugin-ubuntu/binary-plugin_fixed_build_deps |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Juhapekka Piiroinen | Pending | ||
|
Review via email:
|
|||
Description of the change
Fixing build deps
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
