Merge lp:~ken-vandine/ubuntu-system-settings/style_fixes into lp:ubuntu-system-settings

Proposed by Ken VanDine
Status: Merged
Approved by: Sebastien Bacher
Approved revision: 1336
Merged at revision: 1351
Proposed branch: lp:~ken-vandine/ubuntu-system-settings/style_fixes
Merge into: lp:ubuntu-system-settings
Diff against target: 19 lines (+1/-2)
1 file modified
plugins/system-update/download_tracker.cpp (+1/-2)
To merge this branch: bzr merge lp:~ken-vandine/ubuntu-system-settings/style_fixes
Reviewer Review Type Date Requested Status
Sebastien Bacher (community) Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+251146@code.launchpad.net

Commit message

reorder includes to be alphabetical and removed a blank line

Description of the change

reorder includes to be alphabetical and removed a blank line

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Sebastien Bacher (seb128) wrote :

Thanks

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/system-update/download_tracker.cpp'
2--- plugins/system-update/download_tracker.cpp 2015-01-23 10:01:34 +0000
3+++ plugins/system-update/download_tracker.cpp 2015-02-26 19:02:09 +0000
4@@ -18,14 +18,13 @@
5 * Authored by: Diego Sarmentero <diego.sarmentero@canonical.com>
6 */
7
8+#include <QProcessEnvironment>
9 #include <ubuntu/download_manager/download_struct.h>
10 #include <ubuntu/download_manager/error.h>
11-#include <QProcessEnvironment>
12
13 #include "download_tracker.h"
14 #include "network/network.h"
15
16-
17 namespace {
18 const QString DOWNLOAD_COMMAND = "post-download-command";
19 const QString APP_ID = "app_id";

Subscribers

People subscribed via source and target branches