Unity

Merge lp:~aacid/unity/fix_spacing into lp:unity/phablet

  1. fix_spacing
  2. Merge into phablet
Proposed by Albert Astals Cid
Status: Merged
Approved by: Albert Astals Cid
Approved revision: no longer in the source branch.
Merged at revision: 662
Proposed branch: lp:~aacid/unity/fix_spacing
Merge into: lp:unity/phablet
Diff against target: 14 lines (+2/-2)
1 file modified
plugins/Utils/qsortfilterproxymodelqml.cpp (+2/-2)
To merge this branch: bzr merge lp:~aacid/unity/fix_spacing
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Michał Sawicz Approve
Review via email: mp+162947@code.launchpad.net

Commit message

Fix spacing

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:661
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/867/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/792
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/743
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/743/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/747

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/867/rebuild

review: Approve (continuous-integration)
Revision history for this message
Michał Sawicz (saviq) :
review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-phablet-autolanding/311/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/unity-phablet-qmluitests/795/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-autolanding/245
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-autolanding/245/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-autolanding/245

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/Utils/qsortfilterproxymodelqml.cpp'
2--- plugins/Utils/qsortfilterproxymodelqml.cpp 2013-04-16 15:54:41 +0000
3+++ plugins/Utils/qsortfilterproxymodelqml.cpp 2013-05-08 09:38:26 +0000
4@@ -70,8 +70,8 @@
5 while (i.hasNext()) {
6 i.next();
7 result[i.value()] = modelIndex.data(i.key());
8- }
9- return result;
10+ }
11+ return result;
12 }
13
14 int

Subscribers

People subscribed via source and target branches