Merge lp:~timo-jyrinki/ubuntu-seeds/ubuntu-touch.move-to-friends0.2-qml-plugin into lp:~ubuntu-core-dev/ubuntu-seeds/ubuntu-touch.saucy

Proposed by Timo Jyrinki
Status: Merged
Merged at revision: 111
Proposed branch: lp:~timo-jyrinki/ubuntu-seeds/ubuntu-touch.move-to-friends0.2-qml-plugin
Merge into: lp:~ubuntu-core-dev/ubuntu-seeds/ubuntu-touch.saucy
Diff against target: 25 lines (+2/-2)
2 files modified
sdk (+1/-1)
touch (+1/-1)
To merge this branch: bzr merge lp:~timo-jyrinki/ubuntu-seeds/ubuntu-touch.move-to-friends0.2-qml-plugin
Reviewer Review Type Date Requested Status
Loïc Minier Approve
Colin Watson Approve
Review via email: mp+187733@code.launchpad.net

Commit message

qtdeclarative5-friends-plugin -> qtdeclarative5-friends0.2, the former is being removed and is not used anymore.

Description of the change

qtdeclarative5-friends-plugin -> qtdeclarative5-friends0.2, the former is being removed and is not used anymore.

To post a comment you must log in.
Revision history for this message
Colin Watson (cjwatson) :
review: Approve
Revision history for this message
Loïc Minier (lool) wrote :

Yup, looks good

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'sdk'
2--- sdk 2013-09-16 13:39:53 +0000
3+++ sdk 2013-09-26 12:03:26 +0000
4@@ -27,7 +27,7 @@
5 * (libqt5webkit5-qmlwebkitplugin)
6 * (qtdeclarative5-accounts-plugin)
7 * (qtdeclarative5-folderlistmodel-plugin)
8- * (qtdeclarative5-friends-plugin)
9+ * (qtdeclarative5-friends0.2)
10 * (qtdeclarative5-localstorage-plugin)
11 * (qtdeclarative5-particles-plugin)
12 * (qtdeclarative5-qtaudioengine-plugin)
13
14=== modified file 'touch'
15--- touch 2013-09-25 17:21:04 +0000
16+++ touch 2013-09-26 12:03:26 +0000
17@@ -123,7 +123,7 @@
18 * ubuntu-rssreader-app
19 * qtorganizer5-eds
20 * qtdeclarative5-u1db1.0
21- * qtdeclarative5-friends-plugin
22+ * qtdeclarative5-friends0.2
23 * unity-webapps-qml
24
25 == Debug ==

Subscribers

People subscribed via source and target branches