diff options
author | Ananya Sen | 2012-02-17 14:26:56 -0800 |
---|---|---|
committer | Ananya Sen | 2012-02-17 14:26:56 -0800 |
commit | 2980816130a44cd478b2a9d6606e021efbcebd4a (patch) | |
tree | 762d98ba8852b858c03760f4b9bef294fae6486c /manifest.json | |
parent | 96178309ddcdb54c0c451b69ea6fb8cdf76fcf62 (diff) | |
parent | a42c536c2b3209afc058eabd31167bd0aa6f71c8 (diff) | |
download | ninja-2980816130a44cd478b2a9d6606e021efbcebd4a.tar.gz |
Merge branch 'refs/heads/FileIO-jose' into FileIO
Conflicts:
css/ninja.css
js/controllers/document-controller.js
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'manifest.json')
-rw-r--r-- | manifest.json | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/manifest.json b/manifest.json index 12047172..2754c71e 100644 --- a/manifest.json +++ b/manifest.json | |||
@@ -1,7 +1,7 @@ | |||
1 | { | 1 | { |
2 | "name": "Motorola Ninja", | 2 | "name": "Motorola Ninja", |
3 | "description": "Motorola Ninja HTML5 Authoring Tool Pre-Alpha", | 3 | "description": "Motorola Ninja HTML5 Authoring Tool Pre-Alpha", |
4 | "version": "0.5.0.0", | 4 | "version": "0.5.0.1", |
5 | "app": { | 5 | "app": { |
6 | "launch": { | 6 | "launch": { |
7 | "local_path": "index.html" | 7 | "local_path": "index.html" |
@@ -12,14 +12,16 @@ | |||
12 | }, | 12 | }, |
13 | "permissions": [ | 13 | "permissions": [ |
14 | "unlimitedStorage", | 14 | "unlimitedStorage", |
15 | "notifications" | 15 | "notifications", |
16 | "webRequestBlocking", | ||
17 | "webRequest" | ||
16 | ], | 18 | ], |
17 | "requirements": { | 19 | "requirements": { |
18 | "3D": { | 20 | "3D": { |
19 | "features": ["css3d", "webgl"] | 21 | "features": ["css3d", "webgl"] |
20 | } | 22 | } |
21 | }, | 23 | }, |
22 | "minimum_chrome_version": "16.0.0.0", | 24 | "minimum_chrome_version": "17.0.0.0", |
23 | "offline_enabled": true, | 25 | "offline_enabled": true, |
24 | "update_url": "http://tetsubo.org/go/ninjaupdate" | 26 | "update_url": "http://ninjateam.am.mot.com/NinjaApp/update.xml" |
25 | } \ No newline at end of file | 27 | } \ No newline at end of file |