diff options
| author | Ananya Sen | 2012-02-20 16:36:47 -0800 |
|---|---|---|
| committer | Ananya Sen | 2012-02-20 16:36:47 -0800 |
| commit | 7dda611879e6232337d3f0540f8ae896c60fb898 (patch) | |
| tree | 8c6643d6828e46b43281e854ce086de523144943 /manifest.json | |
| parent | 3251315ecc22544dab50623ee5862e00dfe02302 (diff) | |
| parent | 205474042553704dd19b78ac0f909eb2acded2cd (diff) | |
| download | ninja-7dda611879e6232337d3f0540f8ae896c60fb898.tar.gz | |
Merge branch 'refs/heads/FileIO-jose' into FileIO
Conflicts:
js/controllers/document-controller.js
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'manifest.json')
| -rw-r--r-- | manifest.json | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/manifest.json b/manifest.json index 2754c71e..3d156d2b 100644 --- a/manifest.json +++ b/manifest.json | |||
| @@ -11,10 +11,11 @@ | |||
| 11 | "128": "ninja_icon_128.png" | 11 | "128": "ninja_icon_128.png" |
| 12 | }, | 12 | }, |
| 13 | "permissions": [ | 13 | "permissions": [ |
| 14 | "tabs", | ||
| 14 | "unlimitedStorage", | 15 | "unlimitedStorage", |
| 15 | "notifications", | 16 | "notifications", |
| 16 | "webRequestBlocking", | 17 | "webRequest", |
| 17 | "webRequest" | 18 | "webRequestBlocking" |
| 18 | ], | 19 | ], |
| 19 | "requirements": { | 20 | "requirements": { |
| 20 | "3D": { | 21 | "3D": { |