Merge lp://staging/~ahayzen/qtubuntu-print/add-initial-packaging into lp://staging/qtubuntu-print
Proposed by
Andrew Hayzen
| Status: | Merged |
|---|---|
| Approved by: | Andrew Hayzen |
| Approved revision: | 6 |
| Merged at revision: | 1 |
| Proposed branch: | lp://staging/~ahayzen/qtubuntu-print/add-initial-packaging |
| Merge into: | lp://staging/qtubuntu-print |
| Diff against target: |
612 lines (+525/-0) (has conflicts) 15 files modified
debian/changelog (+5/-0) debian/compat (+1/-0) debian/control (+20/-0) debian/copyright (+33/-0) debian/rules (+25/-0) debian/source/format (+1/-0) main.cpp (+49/-0) pdf-plugin.pro (+28/-0) pdf.json (+3/-0) qpdfdevice.cpp (+41/-0) qpdfdevice_p.h (+36/-0) qpdfengine.cpp (+128/-0) qpdfengine_p.h (+50/-0) qpdfsupport.cpp (+63/-0) qpdfsupport_p.h (+42/-0) Conflict adding file debian. Moved existing file to debian.moved. Conflict adding file main.cpp. Moved existing file to main.cpp.moved. Conflict adding file pdf-plugin.pro. Moved existing file to pdf-plugin.pro.moved. Conflict adding file pdf.json. Moved existing file to pdf.json.moved. Conflict adding file qpdfdevice.cpp. Moved existing file to qpdfdevice.cpp.moved. Conflict adding file qpdfdevice_p.h. Moved existing file to qpdfdevice_p.h.moved. Conflict adding file qpdfengine.cpp. Moved existing file to qpdfengine.cpp.moved. Conflict adding file qpdfengine_p.h. Moved existing file to qpdfengine_p.h.moved. Conflict adding file qpdfsupport.cpp. Moved existing file to qpdfsupport.cpp.moved. Conflict adding file qpdfsupport_p.h. Moved existing file to qpdfsupport_p.h.moved. |
| To merge this branch: | bzr merge lp://staging/~ahayzen/qtubuntu-print/add-initial-packaging |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu Phablet Team | Pending | ||
|
Review via email:
|
|||
Commit message
* Initial version
Description of the change
* Initial version
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
