diff options
| author | Valerio Virgillito | 2012-07-24 16:26:51 -0700 |
|---|---|---|
| committer | Valerio Virgillito | 2012-07-24 16:26:51 -0700 |
| commit | 63c115fa5993f9e8d99ee9acf55b90defb087745 (patch) | |
| tree | 6fffc8e827e669cc497edb7eff60c61a3c76500a /manifest.json | |
| parent | f14f381e0a785d37ae08b919b85c1d12fc117e48 (diff) | |
| parent | 9f240b8b9b1f5fb0f145c343ca5e533e25e81374 (diff) | |
| download | ninja-63c115fa5993f9e8d99ee9acf55b90defb087745.tar.gz | |
Merge branch 'master' of https://github.com/mayhewinator/ninja into v0.7.1
Conflicts:
manifest.json
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'manifest.json')
| -rw-r--r-- | manifest.json | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/manifest.json b/manifest.json index 963b509b..8c9e8a66 100644 --- a/manifest.json +++ b/manifest.json | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | { | 1 | { |
| 2 | "name": "Ninja Authoring Tool", | 2 | "name": "Ninja Authoring Tool Preview", |
| 3 | "description": "Ninja HTML5 Authoring Tool - Alpha Release", | 3 | "description": "Ninja HTML5 Authoring Tool Preview", |
| 4 | "version": "0.7.1.0", | 4 | "version": "0.7.1.0", |
| 5 | "app": { | 5 | "app": { |
| 6 | "launch": { | 6 | "launch": { |