Dropping Letters

Merge lp:~kill-animals/dropping-letters/upgrade-ubuntu-components-1.1 into lp:dropping-letters

  1. upgrade-ubuntu-components-1.1
  2. Merge into trunk
Proposed by Kill Animals
Status: Merged
Approved by: Alan Pope 🍺🐧🐱 🦄
Approved revision: 60
Merged at revision: 62
Proposed branch: lp:~kill-animals/dropping-letters/upgrade-ubuntu-components-1.1
Merge into: lp:dropping-letters
Diff against target: 14 lines (+2/-2)
1 file modified
dropping-letters.qml (+2/-2)
To merge this branch: bzr merge lp:~kill-animals/dropping-letters/upgrade-ubuntu-components-1.1
Reviewer Review Type Date Requested Status
Alan Pope 🍺🐧🐱 🦄 (community) Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Review via email: mp+232974@code.launchpad.net

Commit message

Update component imports.

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:60
http://91.189.93.70:8080/job/dropping-letters-ci/29/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/dropping-letters-utopic-amd64-ci/7
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1877/console
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1877/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/dropping-letters-ci/29/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:60
http://91.189.93.70:8080/job/dropping-letters-ci/30/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/dropping-letters-utopic-amd64-ci/8
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1919/console
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1919/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/dropping-letters-ci/30/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:60
http://91.189.93.70:8080/job/dropping-letters-ci/34/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/dropping-letters-utopic-amd64-ci/12
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1999
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1999/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/dropping-letters-ci/34/rebuild

review: Approve (continuous-integration)
Revision history for this message
Alan Pope 🍺🐧🐱 🦄 (popey) wrote :

Thank you!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'dropping-letters.qml'
2--- dropping-letters.qml 2014-05-07 01:12:05 +0000
3+++ dropping-letters.qml 2014-09-02 06:00:44 +0000
4@@ -3,8 +3,8 @@
5 import "binarydict.js" as Wordlist
6 import QtQuick.Particles 2.0
7 import QtQuick.LocalStorage 2.0
8-import Ubuntu.Components 0.1
9-import Ubuntu.Components.Popups 0.1
10+import Ubuntu.Components 1.1
11+import Ubuntu.Components.Popups 1.0
12
13 MainView {
14 id: mainView

Subscribers

People subscribed via source and target branches