diff options
| author | hwc487 | 2012-07-11 10:20:22 -0700 |
|---|---|---|
| committer | hwc487 | 2012-07-11 10:20:22 -0700 |
| commit | 325cf1dcbd7fc1e1ec6a9ac4829954f7e0ae2afb (patch) | |
| tree | b1f12bce35d5281a3a3d47e3cdcbd75d4c498810 /manifest.json | |
| parent | 67dd4bdd47a0324507bed232d22068aa198549fe (diff) | |
| parent | 688e22dc367f37d4b8734a37daa3b823ea450295 (diff) | |
| download | ninja-325cf1dcbd7fc1e1ec6a9ac4829954f7e0ae2afb.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja into GridFixes
Conflicts:
assets/shaders/radialBlur.frag.glsl
Diffstat (limited to 'manifest.json')
| -rw-r--r-- | manifest.json | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/manifest.json b/manifest.json index c2dc6a3d..331fd1f8 100644 --- a/manifest.json +++ b/manifest.json | |||
| @@ -8,6 +8,7 @@ | |||
| 8 | } | 8 | } |
| 9 | }, | 9 | }, |
| 10 | "icons": { | 10 | "icons": { |
| 11 | "16": "ninja_icon_16.png", | ||
| 11 | "128": "ninja_icon_128.png" | 12 | "128": "ninja_icon_128.png" |
| 12 | }, | 13 | }, |
| 13 | "permissions": [ | 14 | "permissions": [ |
| @@ -15,7 +16,7 @@ | |||
| 15 | "notifications", | 16 | "notifications", |
| 16 | "webRequest", | 17 | "webRequest", |
| 17 | "webRequestBlocking", | 18 | "webRequestBlocking", |
| 18 | "http://ninja/*", | 19 | "http://tetsubo.org/*", |
| 19 | "clipboardRead", | 20 | "clipboardRead", |
| 20 | "clipboardWrite" | 21 | "clipboardWrite" |
| 21 | ], | 22 | ], |
| @@ -25,6 +26,5 @@ | |||
| 25 | } | 26 | } |
| 26 | }, | 27 | }, |
| 27 | "minimum_chrome_version": "20.0.1132.47", | 28 | "minimum_chrome_version": "20.0.1132.47", |
| 28 | "offline_enabled": true, | 29 | "offline_enabled": true |
| 29 | "update_url": "http://ninjateam.am.mot.com/NinjaApp/update.xml" | ||
| 30 | } \ No newline at end of file | 30 | } \ No newline at end of file |