diff options
| author | Armen Kesablyan | 2012-06-25 11:14:40 -0700 |
|---|---|---|
| committer | Armen Kesablyan | 2012-06-25 11:14:40 -0700 |
| commit | 446f475c35e3d0d5d6cb6ca35346e548de6c36f9 (patch) | |
| tree | 0b7e7154979754db2c0ebb7b7908c555068d515d /manifest.json | |
| parent | 7867aec2620b65605180979b5049cfa154ca7dd1 (diff) | |
| parent | 35aebe8d72ccfa9ea010eb79c09ecf89cc1ed44d (diff) | |
| download | ninja-446f475c35e3d0d5d6cb6ca35346e548de6c36f9.tar.gz | |
Merge branch 'refs/heads/master' into binding
Conflicts:
js/ninja.reel/ninja.html
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'manifest.json')
| -rw-r--r-- | manifest.json | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/manifest.json b/manifest.json index e9406399..f1703b99 100644 --- a/manifest.json +++ b/manifest.json | |||
| @@ -15,7 +15,9 @@ | |||
| 15 | "notifications", | 15 | "notifications", |
| 16 | "webRequest", | 16 | "webRequest", |
| 17 | "webRequestBlocking", | 17 | "webRequestBlocking", |
| 18 | "http://ninja/*" | 18 | "http://ninja/*", |
| 19 | "clipboardRead", | ||
| 20 | "clipboardWrite" | ||
| 19 | ], | 21 | ], |
| 20 | "requirements": { | 22 | "requirements": { |
| 21 | "3D": { | 23 | "3D": { |