diff options
| author | Ananya Sen | 2012-07-09 16:52:49 -0700 |
|---|---|---|
| committer | Ananya Sen | 2012-07-09 16:52:49 -0700 |
| commit | 2eb84584f44b8c774479d1af2ee1d810597474cf (patch) | |
| tree | 64cb3e09a8daeb340261dd7f3869c73f7b90b643 /manifest.json | |
| parent | bf9dba001ec84243e2f12cd13b0c0ae020fba4a2 (diff) | |
| parent | cee0deca695359ab468bd06d0e05ed3b2010b338 (diff) | |
| download | ninja-2eb84584f44b8c774479d1af2ee1d810597474cf.tar.gz | |
Merge branch 'refs/heads/ninja-internal-master' into codemirror-custom-theme-removal
Conflicts:
js/code-editor/codemirror-ninja/theme/lesser-dark-ninja.css
js/code-editor/codemirror-ninja/theme/xq-dark-ninja.css
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
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 874f0c2f..c2dc6a3d 100644 --- a/manifest.json +++ b/manifest.json | |||
| @@ -1,7 +1,7 @@ | |||
| 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" |
| @@ -24,7 +24,7 @@ | |||
| 24 | "features": ["css3d", "webgl"] | 24 | "features": ["css3d", "webgl"] |
| 25 | } | 25 | } |
| 26 | }, | 26 | }, |
| 27 | "minimum_chrome_version": "18.0.1025.162", | 27 | "minimum_chrome_version": "20.0.1132.47", |
| 28 | "offline_enabled": true, | 28 | "offline_enabled": true, |
| 29 | "update_url": "http://ninjateam.am.mot.com/NinjaApp/update.xml" | 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 |