diff options
| author | Kruti Shah | 2012-07-03 10:08:44 -0700 |
|---|---|---|
| committer | Kruti Shah | 2012-07-03 10:08:44 -0700 |
| commit | bf5e6d6febf0c15a00e7694d7fa2c85b0cf567fe (patch) | |
| tree | 006f6243962aa2e2b59f688cf37b16162376dc39 /manifest.json | |
| parent | 3aa1242147264351b7d827fa25ecb5dc42bc2fb0 (diff) | |
| parent | 12de4e49a309e210c13eb40b2ffa158ef2eb54a7 (diff) | |
| download | ninja-bf5e6d6febf0c15a00e7694d7fa2c85b0cf567fe.tar.gz | |
Merge branch 'refs/heads/ninjainternalmaster' into Timeline-local-kruti
Conflicts:
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.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 f1703b99..874f0c2f 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.6.0.0", | 4 | "version": "0.7.0.0", |
| 5 | "app": { | 5 | "app": { |
| 6 | "launch": { | 6 | "launch": { |
| 7 | "local_path": "index.html" | 7 | "local_path": "index.html" |