on xenial help sign in
Merge trunk.
286ee5aMichał Sawicz
debian/changelog+8
@@ -1,3 +1,11 @@
1+unity8 (7.84+14.04.20140130-0ubuntu1) trusty; urgency=low
2+
3+ [ Michał Sawicz ]
4+ * Bring back libunity-mir1, it's dlopen'ed, so not linked to unity8,
5+ so not in shlibs.
6+
7+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Thu, 30 Jan 2014 14:00:40 +0000
8+
1unity8 (7.84+14.04.20140129-0ubuntu1) trusty; urgency=low
9unity8 (7.84+14.04.20140129-0ubuntu1) trusty; urgency=low
2
10
3 [ Nick Dedekind ]
11 [ Nick Dedekind ]
debian/control+1
@@ -74,6 +74,7 @@ Architecture: any
74Provides: indicator-renderer,
74Provides: indicator-renderer,
75Depends: gsettings-desktop-schemas,
75Depends: gsettings-desktop-schemas,
76 libglib2.0-bin,
76 libglib2.0-bin,
77+ libunity-mir1,
77 qmenumodel-qml (>= 0.2.7),
78 qmenumodel-qml (>= 0.2.7),
78 qtdeclarative5-dee-plugin,
79 qtdeclarative5-dee-plugin,
79 qtdeclarative5-gsettings1.0,
80 qtdeclarative5-gsettings1.0,
po/bg.po+1−1
@@ -15,7 +15,7 @@ msgstr ""
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2014-01-29 06:08+0000\n"
18+"X-Launchpad-Export-Date: 2014-01-30 06:07+0000\n"
19"X-Generator: Launchpad (build 16916)\n"
19"X-Generator: Launchpad (build 16916)\n"
20
20
21#: Components/EdgeDemoOverlay.qml:151
21#: Components/EdgeDemoOverlay.qml:151