unity-2d

Merge lp:~saviq/unity-2d/move-common-text into lp:~unity-2d-team/unity-2d/unity-2d-shell

  1. move-common-text
  2. Merge into unity-2d-shell
Proposed by Michał Sawicz
Status: Merged
Approved by: Ugo Riboni
Approved revision: 854
Merged at revision: 854
Proposed branch: lp:~saviq/unity-2d/move-common-text
Merge into: lp:~unity-2d-team/unity-2d/unity-2d-shell
Diff against target: 13 lines (+1/-0)
1 file modified
shell/dash/FilterLoader.qml (+1/-0)
To merge this branch: bzr merge lp:~saviq/unity-2d/move-common-text
Reviewer Review Type Date Requested Status
Ugo Riboni Pending
Review via email: mp+83911@code.launchpad.net

Commit message

[common] move TextCustom and TextMultiLine into common dir

Description of the change

[common] move TextCustom and TextMultiLine into common dir

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== renamed file 'shell/dash/TextCustom.qml' => 'shell/common/TextCustom.qml'
2=== renamed file 'shell/dash/TextMultiLine.qml' => 'shell/common/TextMultiLine.qml'
3=== modified file 'shell/dash/FilterLoader.qml'
4--- shell/dash/FilterLoader.qml 2011-11-29 17:17:01 +0000
5+++ shell/dash/FilterLoader.qml 2011-11-30 10:46:26 +0000
6@@ -17,6 +17,7 @@
7 */
8
9 import QtQuick 1.0
10+import "../common"
11 import "../common/utils.js" as Utils
12
13 FocusScope {

Subscribers

People subscribed via source and target branches

to all changes: