Merge lp://staging/~zeller-benjamin/qtcreator-plugin-ubuntu/bug1264404 into lp://staging/qtcreator-plugin-ubuntu
Proposed by
Benjamin Zeller
| Status: | Merged |
|---|---|
| Approved by: | Zoltan Balogh |
| Approved revision: | 72 |
| Merged at revision: | 74 |
| Proposed branch: | lp://staging/~zeller-benjamin/qtcreator-plugin-ubuntu/bug1264404 |
| Merge into: | lp://staging/qtcreator-plugin-ubuntu |
| Diff against target: |
78 lines (+12/-6) 6 files modified
share/qtcreator/templates/wizards/ubuntu/backendplustabs/app/displayName.desktop (+0/-1) share/qtcreator/templates/wizards/ubuntu/html5-tabs/displayName.desktop (+0/-1) share/qtcreator/templates/wizards/ubuntu/simple/displayName.desktop (+0/-1) share/qtcreator/templates/wizards/ubuntu/tabs/displayName.desktop (+0/-1) share/qtcreator/templates/wizards/ubuntu/webapp/app.desktop (+0/-1) share/qtcreator/ubuntu/scripts/qtc_project_click_create (+12/-1) |
| To merge this branch: | bzr merge lp://staging/~zeller-benjamin/qtcreator-plugin-ubuntu/bug1264404 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Zoltan Balogh | Approve | ||
| PS Jenkins bot | continuous-integration | Approve | |
|
Review via email:
|
|||
Commit message
* Do not ship a comment in the desktop file, because manifest should take precedence
* The manifest desciption always takes precedence over the desktop file (Fixes: #1264404)
Description of the change
* Do not ship a comment in the desktop file, because manifest should take precedence
* The manifest desciption always takes precedence over the desktop file (Fixes: #1264404)
To post a comment you must log in.
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Approve
(continuous-integration)
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
PASSED: Continuous integration, rev:72
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://