camera-app

Merge lp:~bfiller/camera-app/content-hub-fixes into lp:~fboucault/camera-app/ui_rewrite

  1. content-hub-fixes
  2. Merge into ui_rewrite
Proposed by Bill Filler
Status: Merged
Approved by: Florian Boucault
Approved revision: 338
Merged at revision: 338
Proposed branch: lp:~bfiller/camera-app/content-hub-fixes
Merge into: lp:~fboucault/camera-app/ui_rewrite
Diff against target: 23 lines (+7/-0)
2 files modified
click/camera-content.json (+6/-0)
click/manifest.json.in (+1/-0)
To merge this branch: bzr merge lp:~bfiller/camera-app/content-hub-fixes
Reviewer Review Type Date Requested Status
Florian Boucault Pending
Review via email: mp+225398@code.launchpad.net

Description of the change

fix content-hub integration

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=== added file 'click/camera-content.json'
2--- click/camera-content.json 1970-01-01 00:00:00 +0000
3+++ click/camera-content.json 2014-07-02 20:57:00 +0000
4@@ -0,0 +1,6 @@
5+{
6+ "source": [
7+ "pictures",
8+ "videos"
9+ ]
10+}
11\ No newline at end of file
12
13=== modified file 'click/manifest.json.in'
14--- click/manifest.json.in 2014-06-30 08:17:29 +0000
15+++ click/manifest.json.in 2014-07-02 20:57:00 +0000
16@@ -6,6 +6,7 @@
17 "hooks": {
18 "camera": {
19 "apparmor": "camera-apparmor.json",
20+ "content-hub": "camera-content.json",
21 "desktop": "@CMAKE_INSTALL_DATADIR@/applications/@DESKTOP_FILE@"
22 }
23 },

Subscribers

People subscribed via source and target branches

to all changes: