aboutsummaryrefslogtreecommitdiff
path: root/manifest.json
diff options
context:
space:
mode:
authorhwc4872012-03-24 14:07:58 -0700
committerhwc4872012-03-24 14:07:58 -0700
commitcca20db1f346fc9bf2ead64c83e479f5f5ebf2d2 (patch)
tree4f5c42f0a1df00dcd1a2064dd176fcff7930ba47 /manifest.json
parent62f4327f9b83760e52a1f6bf1e689b1e0a780fbb (diff)
parent7ee75fef18c21275cf29740a6fdd81ea90e41f45 (diff)
downloadninja-cca20db1f346fc9bf2ead64c83e479f5f5ebf2d2.tar.gz
Merge branch 'montage-integration' of github.com:Motorola-Mobility/ninja-internal into Textures
Diffstat (limited to 'manifest.json')
-rw-r--r--manifest.json3
1 files changed, 2 insertions, 1 deletions
diff --git a/manifest.json b/manifest.json
index 80d8a5be..50e1cba1 100644
--- a/manifest.json
+++ b/manifest.json
@@ -14,7 +14,8 @@
14 "unlimitedStorage", 14 "unlimitedStorage",
15 "notifications", 15 "notifications",
16 "webRequest", 16 "webRequest",
17 "webRequestBlocking" 17 "webRequestBlocking",
18 "http://www.google.com/*"
18 ], 19 ],
19 "requirements": { 20 "requirements": {
20 "3D": { 21 "3D": {