1
=== modified file 'src/UbuntuToolkit/ucmainwindow.cpp'
2
--- src/UbuntuToolkit/ucmainwindow.cpp	2017-01-12 15:20:31 +0000
3
+++ src/UbuntuToolkit/ucmainwindow.cpp	2017-01-17 08:52:34 +0000
4
@@ -40,7 +40,7 @@
5
40
  \qml
40
  \qml
6
41
      import QtQuick 2.4
41
      import QtQuick 2.4
7
42
      import Ubuntu.Components 1.3
42
      import Ubuntu.Components 1.3
9
43
      import Ubuntu.Components.Labs 1.3
43
      import Ubuntu.Components.Labs 1.0
10
44
44
11
45
      MainWindow {
45
      MainWindow {
12
46
          minimumWidth: units.gu(48)
46
          minimumWidth: units.gu(48)
13
@@ -74,7 +74,7 @@
14
74
  \qml
74
  \qml
15
75
      import QtQuick 2.4
75
      import QtQuick 2.4
16
76
      import Ubuntu.Components 1.3
76
      import Ubuntu.Components 1.3
18
77
      import Ubuntu.Components.Labs 1.3
77
      import Ubuntu.Components.Labs 1.0
19
78
78
20
79
      MainWindow {
79
      MainWindow {
21
80
          minimumWidth: units.gu(48)
80
          minimumWidth: units.gu(48)
Status:	Merged
Approved by:	Cris Dywan on 2017-01-17
Approved revision:	2158
Merged at revision:	2158
Proposed branch:	lp:~aacid/ubuntu-ui-toolkit/labs_is_1_0
Merge into:	lp:ubuntu-ui-toolkit/staging
Diff against target:	21 lines (+2/-2) 1 file modified src/UbuntuToolkit/ucmainwindow.cpp (+2/-2)
To merge this branch:	bzr merge lp:~aacid/ubuntu-ui-toolkit/labs_is_1_0
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
ubuntu-sdk-build-bot	continuous-integration		Approve on 2017-01-17
Cris Dywan		2017-01-17	Approve on 2017-01-17
Review via email: mp+314894@code.launchpad.net
1	=== modified file 'src/UbuntuToolkit/ucmainwindow.cpp'
2	--- src/UbuntuToolkit/ucmainwindow.cpp 2017-01-12 15:20:31 +0000
3	+++ src/UbuntuToolkit/ucmainwindow.cpp 2017-01-17 08:52:34 +0000
4	@@ -40,7 +40,7 @@
5	40	\qml	40	\qml
6	41	import QtQuick 2.4	41	import QtQuick 2.4
7	42	import Ubuntu.Components 1.3	42	import Ubuntu.Components 1.3
9	43	import Ubuntu.Components.Labs 1.3	43	import Ubuntu.Components.Labs 1.0
10	44		44
11	45	MainWindow {	45	MainWindow {
12	46	minimumWidth: units.gu(48)	46	minimumWidth: units.gu(48)
13	@@ -74,7 +74,7 @@
14	74	\qml	74	\qml
15	75	import QtQuick 2.4	75	import QtQuick 2.4
16	76	import Ubuntu.Components 1.3	76	import Ubuntu.Components 1.3
18	77	import Ubuntu.Components.Labs 1.3	77	import Ubuntu.Components.Labs 1.0
19	78		78
20	79	MainWindow {	79	MainWindow {
21	80	minimumWidth: units.gu(48)	80	minimumWidth: units.gu(48)