merge prereq
commit24c9f5fd8c8c0f43f588e71065df2c2ac590cfba
authorLukáš Tinkl <lukas.tinkl@canonical.com>
dateMon 9 Jan 2017, 18:56 (10 years ago)
parent1f8ab9ca845c9b
qml/Launcher/Drawer.qml+3−3
@@ -122,9 +122,9 @@ FocusScope {
122122 Action {
123123 text: i18n.ctr("Apps sorted alphabetically", "A-Z")
124124 // TODO: Disabling this for now as we don't get the right input from u-a-l yet.
125− },
126− Action {
127− text: i18n.ctr("Most used apps", "Most used")
125+// },
126+// Action {
127+// text: i18n.ctr("Most used apps", "Most used")
128128 }
129129 ]
130130
tests/qmltests/tst_ShellWithPin.qml+1−1
@@ -573,5 +573,5 @@ Item {
573573
574574 tryCompare(launcher, "state", "drawer");
575575 }
576− }
576+ }
577577}