diff options
| author | Pushkar Joshi | 2012-02-28 14:01:05 -0800 |
|---|---|---|
| committer | Pushkar Joshi | 2012-02-28 14:01:05 -0800 |
| commit | 63307c9abf120985d979a40a53a0598d3f0d5c5a (patch) | |
| tree | 57d9cffd7aa0959ea31fe0fa2d89a9080198bcb3 /manifest.json | |
| parent | e1a65d0c2a13e12ee53be98c731616e35aa07a41 (diff) | |
| parent | 7c9291a5bab4abd849547f8878f6fb962fc88250 (diff) | |
| download | ninja-63307c9abf120985d979a40a53a0598d3f0d5c5a.tar.gz | |
Merge branch 'master' into pentool
Conflicts:
manifest.json
Diffstat (limited to 'manifest.json')
| -rw-r--r-- | manifest.json | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/manifest.json b/manifest.json index e9abd76f..313b8d8f 100644 --- a/manifest.json +++ b/manifest.json | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | { | 1 | { |
| 2 | "name": "Motorola Ninja Unpacked", | 2 | "name": "Motorola Ninja Unpacked", |
| 3 | "description": "Motorola Ninja HTML5 Authoring Tool Pre-Alpha", | 3 | "description": "Motorola Ninja HTML5 Authoring Tool - Alpha Release", |
| 4 | "version": "0.5.0.1", | 4 | "version": "0.5.0.9", |
| 5 | "app": { | 5 | "app": { |
| 6 | "launch": { | 6 | "launch": { |
| 7 | "local_path": "index.html" | 7 | "local_path": "index.html" |
| @@ -11,7 +11,6 @@ | |||
| 11 | "128": "ninja_icon_128.png" | 11 | "128": "ninja_icon_128.png" |
| 12 | }, | 12 | }, |
| 13 | "permissions": [ | 13 | "permissions": [ |
| 14 | "tabs", | ||
| 15 | "unlimitedStorage", | 14 | "unlimitedStorage", |
| 16 | "notifications", | 15 | "notifications", |
| 17 | "webRequest", | 16 | "webRequest", |