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 /js/components/about-box.reel/about-box.html | |
| 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 'js/components/about-box.reel/about-box.html')
| -rw-r--r-- | js/components/about-box.reel/about-box.html | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/js/components/about-box.reel/about-box.html b/js/components/about-box.reel/about-box.html index 68220086..2705972b 100644 --- a/js/components/about-box.reel/about-box.html +++ b/js/components/about-box.reel/about-box.html | |||
| @@ -48,8 +48,9 @@ POSSIBILITY OF SUCH DAMAGE. | |||
| 48 | <body> | 48 | <body> |
| 49 | <div data-montage-id="mainAboutBoxContainer" class="mainAboutBoxContainer"> | 49 | <div data-montage-id="mainAboutBoxContainer" class="mainAboutBoxContainer"> |
| 50 | <div id="about_box_ninja_logo"></div> | 50 | <div id="about_box_ninja_logo"></div> |
| 51 | <div id="about_box_preview_logo"></div> | ||
| 51 | <div id="aboutBoxTextBlock" class="baseAboutBoxText"> | 52 | <div id="aboutBoxTextBlock" class="baseAboutBoxText"> |
| 52 | <p class="mediumAboutBoxText">Ninja™</p> | 53 | <p class="mediumAboutBoxText">Ninja™ - Preview Release</p> |
| 53 | <p class="mediumAboutBoxText">Version: <span id="aboutBoxVersionNumber">0.0.0.0</span></p> | 54 | <p class="mediumAboutBoxText">Version: <span id="aboutBoxVersionNumber">0.0.0.0</span></p> |
| 54 | <p>Copyright © 2012 Motorola Mobility LLC. All rights reserved.</p> | 55 | <p>Copyright © 2012 Motorola Mobility LLC. All rights reserved.</p> |
| 55 | <p>The Ninja application is made possible by the <a href="http://tetsubo.org/go/ninjaland" target="_blank" class="aboutBoxAnchor">Ninja open source project</a> and <a href="credits.html" target="_blank" class="aboutBoxAnchor">other open source software</a>.</p> | 56 | <p>The Ninja application is made possible by the <a href="http://tetsubo.org/go/ninjaland" target="_blank" class="aboutBoxAnchor">Ninja open source project</a> and <a href="credits.html" target="_blank" class="aboutBoxAnchor">other open source software</a>.</p> |