diff options
| author | Kruti Shah | 2012-05-31 10:44:45 -0700 |
|---|---|---|
| committer | Kruti Shah | 2012-05-31 10:44:45 -0700 |
| commit | c350cc1c060fdf17357ddadce024267943784593 (patch) | |
| tree | 453f86e88f1ee1dfda6fb4b7cc7b17e306e39536 /manifest.json | |
| parent | fdc4f5c7f81ae3b9adeca2232e60268b4be594a2 (diff) | |
| parent | 121d0e616f48aa7cd048763554089c20a1883d7a (diff) | |
| download | ninja-c350cc1c060fdf17357ddadce024267943784593.tar.gz | |
Merge branch 'refs/heads/TimelineUberjd' into TimelineUber
Conflicts:
js/panels/Timeline/Layer.reel/Layer.js
Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
Diffstat (limited to 'manifest.json')
| -rw-r--r-- | manifest.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/manifest.json b/manifest.json index b46c9826..e9406399 100644 --- a/manifest.json +++ b/manifest.json | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | { | 1 | { |
| 2 | "name": "Ninja", | 2 | "name": "Ninja", |
| 3 | "description": "Ninja HTML5 Authoring Tool - Alpha Release", | 3 | "description": "Ninja HTML5 Authoring Tool - Alpha Release", |
| 4 | "version": "0.5.3.0", | 4 | "version": "0.6.0.0", |
| 5 | "app": { | 5 | "app": { |
| 6 | "launch": { | 6 | "launch": { |
| 7 | "local_path": "index.html" | 7 | "local_path": "index.html" |