aboutsummaryrefslogtreecommitdiff
path: root/manifest.json
diff options
context:
space:
mode:
authorhwc4872012-02-22 10:58:40 -0800
committerhwc4872012-02-22 10:58:40 -0800
commit1a72686c9b915c488f9b430995787d2176671561 (patch)
tree849ca3d54f68c6c327c3daa240b48c7be6f73e91 /manifest.json
parentbb441ec8f8080cdaa52257a40531c62c47028667 (diff)
parent2f24dafec79583547fe663d5a387d8ef15aae3bf (diff)
downloadninja-1a72686c9b915c488f9b430995787d2176671561.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into integration
Diffstat (limited to 'manifest.json')
-rw-r--r--manifest.json5
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": {