diff options
| author | hwc487 | 2012-03-23 13:49:03 -0700 |
|---|---|---|
| committer | hwc487 | 2012-03-23 13:49:03 -0700 |
| commit | 51478dbad8290f55eeab9efdfb8c2cbe24b12b10 (patch) | |
| tree | 1524c53d027d1f2f8cbb759f61e4d73b52b00481 /manifest.json | |
| parent | 31e924e1b8b8da8342b3ff2341c8284915486c0b (diff) | |
| parent | bc8b0c17023ddea6d77150694a777e104ef99cbc (diff) | |
| download | ninja-51478dbad8290f55eeab9efdfb8c2cbe24b12b10.tar.gz | |
Merge branch 'montage-integration' of github.com:Motorola-Mobility/ninja-internal into integration
Conflicts:
js/io/system/ninjalibrary.json
Diffstat (limited to 'manifest.json')
| -rw-r--r-- | manifest.json | 3 |
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": { |