aboutsummaryrefslogtreecommitdiff
path: root/js/components/popup.reel/popup.html
diff options
context:
space:
mode:
authorhwc4872012-07-09 16:08:02 -0700
committerhwc4872012-07-09 16:08:02 -0700
commit5085d0f67df89a21715308956004164597a6ba79 (patch)
tree2c896163143a66331205a39b0a3b1b45d51bf12a /js/components/popup.reel/popup.html
parent51f1691f792dbda9b740ded8aa0457c9406db156 (diff)
parent84b3327bd92faafab7954b5eb64c7abe24a3fe13 (diff)
downloadninja-5085d0f67df89a21715308956004164597a6ba79.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into GridFixes
Conflicts: js/helper-classes/3D/StageLine.js
Diffstat (limited to 'js/components/popup.reel/popup.html')
-rwxr-xr-xjs/components/popup.reel/popup.html34
1 files changed, 17 insertions, 17 deletions
diff --git a/js/components/popup.reel/popup.html b/js/components/popup.reel/popup.html
index ee468827..febe488f 100755
--- a/js/components/popup.reel/popup.html
+++ b/js/components/popup.reel/popup.html
@@ -1,4 +1,4 @@
1<!DOCTYPE html> 1<!doctype html>
2<!-- <copyright> 2<!-- <copyright>
3Copyright (c) 2012, Motorola Mobility, Inc 3Copyright (c) 2012, Motorola Mobility, Inc
4All Rights Reserved. 4All Rights Reserved.
@@ -29,11 +29,11 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
29POSSIBILITY OF SUCH DAMAGE. 29POSSIBILITY OF SUCH DAMAGE.
30</copyright> --> 30</copyright> -->
31<html lang="en"> 31<html lang="en">
32 <head> 32 <head>
33 33
34 <meta http-equiv="content-type" content="text/html; charset=utf-8" /> 34 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
35 35
36 <link rel="stylesheet" type="text/css" href="css/popup.css"> 36 <link rel="stylesheet" type="text/css" href="css/popup.css">
37 37
38 <script type="text/montage-serialization"> 38 <script type="text/montage-serialization">
39 { 39 {
@@ -47,16 +47,16 @@ POSSIBILITY OF SUCH DAMAGE.
47 } 47 }
48 } 48 }
49 </script> 49 </script>
50 50
51 </head> 51 </head>
52 52
53 <body> 53 <body>
54 54
55 <div data-montage-id="default_popup" class="default_popup"> 55 <div data-montage-id="default_popup" class="default_popup">
56 <div data-montage-id="tooltip" class="tooltip"><span/></div> 56 <div data-montage-id="tooltip" class="tooltip"><span/></div>
57 <div data-montage-id="content" class="content"></div> 57 <div data-montage-id="content" class="content"></div>
58 </div> 58 </div>
59 59
60 </body> 60 </body>
61 61
62</html> 62</html>