diff options
| author | Pushkar Joshi | 2012-03-27 09:10:58 -0700 |
|---|---|---|
| committer | Pushkar Joshi | 2012-03-27 09:10:58 -0700 |
| commit | 0c26aff9c19c2b39fca06fa6b3bc76b672204065 (patch) | |
| tree | e778f2b9d5d525aa364360d5996536a0a06379bd /manifest.json | |
| parent | 753244b4713243ab19ca246be674f0b45fb85b72 (diff) | |
| parent | 309dde5a8c4599cef6a1052c1ff9ee1ad8ec5858 (diff) | |
| download | ninja-0c26aff9c19c2b39fca06fa6b3bc76b672204065.tar.gz | |
Merge branch 'master' into brushtool
Conflicts:
js/controllers/elements/shapes-controller.js
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": { |