diff options
| author | John Mayhew | 2012-07-09 17:28:24 -0700 |
|---|---|---|
| committer | John Mayhew | 2012-07-09 17:28:24 -0700 |
| commit | 770bcb52422742ff741a88a75ecefbeb90bc9247 (patch) | |
| tree | 64cb3e09a8daeb340261dd7f3869c73f7b90b643 /manifest.json | |
| parent | 8c5ecaf90062f9e030386f338bdc19fd62b826c8 (diff) | |
| parent | 2b2b5fbb4b6a786daa4e9d4ee9eba9ac78924842 (diff) | |
| download | ninja-770bcb52422742ff741a88a75ecefbeb90bc9247.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal
Conflicts:
manifest.json
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 a4fc9c63..c2dc6a3d 100644 --- a/manifest.json +++ b/manifest.json | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | { | 1 | { |
| 2 | "name": "Ninja - 0.7.0.0", | 2 | "name": "Ninja Authoring Tool", |
| 3 | "description": "Ninja - Alpha Release 0.7.0.0", | 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" |