Merge lp:~bzoltan/ubuntu-ui-toolkit/apparmor into lp:ubuntu-ui-toolkit

Proposed by Zoltan Balogh on 2016-04-16
Status: Merged
Approved by: Zoltan Balogh on 2016-04-18
Approved revision: 1301
Merged at revision: 1301
Proposed branch: lp:~bzoltan/ubuntu-ui-toolkit/apparmor
Merge into: lp:ubuntu-ui-toolkit
Diff against target: 11 lines (+1/-1)
1 file modified
examples/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.pro (+1/-1)
To merge this branch: bzr merge lp:~bzoltan/ubuntu-ui-toolkit/apparmor
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing on 2016-04-16
Ubuntu SDK team 2016-04-16 Pending
Review via email: mp+292072@code.launchpad.net

Commit Message

Install the apparmor file with the UITK showcase gallery example application

Description of the Change

Install the apparmor file with the UITK showcase gallery example application

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=== modified file 'examples/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.pro'
2--- examples/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.pro 2016-04-14 15:48:27 +0000
3+++ examples/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.pro 2016-04-16 18:06:55 +0000
4@@ -2,7 +2,7 @@
5
6 SUBDIRS += po
7
8-filetypes = qml png svg js jpg pro desktop in
9+filetypes = qml png svg js jpg pro desktop in apparmor
10
11 OTHER_FILES = ""
12

Subscribers

People subscribed via source and target branches

to status/vote changes: