diff options
| author | Jonathan Duran | 2012-07-17 09:30:22 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-07-17 09:30:22 -0700 |
| commit | 53051672a62208fbc96957719d8285fac6431ed6 (patch) | |
| tree | 79d542ee811044e8af2ef84aa0d6662c6eb895c4 /manifest.json | |
| parent | 7e2c2dbd040ed79a3f0678f91bd4b6db9cf69231 (diff) | |
| parent | 5146f224258929415adf4a8022e492454b4e2476 (diff) | |
| download | ninja-53051672a62208fbc96957719d8285fac6431ed6.tar.gz | |
Merge branch 'refs/heads/NINJA-master' into TimelineUber
Conflicts:
js/panels/Timeline/DragDrop.js
js/panels/Timeline/Keyframe.reel/Keyframe.js
js/panels/Timeline/Layer.reel/Layer.js
js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
js/panels/Timeline/Span.reel/Span.js
js/panels/Timeline/Style.reel/Style.js
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
js/panels/Timeline/Track.reel/Track.html
js/panels/Timeline/Track.reel/Track.js
js/panels/Timeline/Track.reel/css/Track.css
js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html
js/panels/Timeline/TrackSpacer.reel/TrackSpacer.js
js/panels/Timeline/TrackSpacer.reel/css/TrackSpacer.css
js/panels/Timeline/Tween.reel/Tween.js
Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'manifest.json')
| -rw-r--r-- | manifest.json | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/manifest.json b/manifest.json index 874f0c2f..331fd1f8 100644 --- a/manifest.json +++ b/manifest.json | |||
| @@ -1,13 +1,14 @@ | |||
| 1 | { | 1 | { |
| 2 | "name": "Ninja", | 2 | "name": "Ninja Authoring Tool", |
| 3 | "description": "Ninja HTML5 Authoring Tool - Alpha Release", | 3 | "description": "Ninja HTML5 Authoring Tool - Alpha Release", |
| 4 | "version": "0.7.0.0", | 4 | "version": "0.8.0.0", |
| 5 | "app": { | 5 | "app": { |
| 6 | "launch": { | 6 | "launch": { |
| 7 | "local_path": "index.html" | 7 | "local_path": "index.html" |
| 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 | ], |
| @@ -24,7 +25,6 @@ | |||
| 24 | "features": ["css3d", "webgl"] | 25 | "features": ["css3d", "webgl"] |
| 25 | } | 26 | } |
| 26 | }, | 27 | }, |
| 27 | "minimum_chrome_version": "18.0.1025.162", | 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 |