Merge lp:~unity-team/unity8/edgedemo-update-indicators into lp:unity8/rtm-14.09

Proposed by kevin gunn
Status: Merged
Approved by: kevin gunn
Approved revision: 1363
Merged at revision: 1363
Proposed branch: lp:~unity-team/unity8/edgedemo-update-indicators
Merge into: lp:unity8/rtm-14.09
Diff against target: 12 lines (+1/-1)
1 file modified
qml/Components/EdgeDemo.qml (+1/-1)
To merge this branch: bzr merge lp:~unity-team/unity8/edgedemo-update-indicators
Reviewer Review Type Date Requested Status
kevin gunn (community) Approve
Review via email: mp+238637@code.launchpad.net

Commit message

update edgedemo to account for new indicators

Description of the change

update edgedemo to account for new indicators

To post a comment you must log in.
Revision history for this message
kevin gunn (kgunn72) wrote :

based on testing, one line change only effects edge demo

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'qml/Components/EdgeDemo.qml'
--- qml/Components/EdgeDemo.qml 2014-08-06 14:33:50 +0000
+++ qml/Components/EdgeDemo.qml 2014-10-17 00:06:57 +0000
@@ -169,7 +169,7 @@
169 "edge": "bottom",169 "edge": "bottom",
170 "title": i18n.tr("Close"),170 "title": i18n.tr("Close"),
171 "text": i18n.tr("Swipe up again to close the settings screen"),171 "text": i18n.tr("Swipe up again to close the settings screen"),
172 "anchors.fill": demo.indicators.content,172 "anchors.fill": demo.indicators,
173 });173 });
174 }174 }
175 if (d.bottomEdgeDemo) {175 if (d.bottomEdgeDemo) {

Subscribers

People subscribed via source and target branches

to all changes: