aboutsummaryrefslogtreecommitdiff
path: root/js/components/hintable.reel
diff options
context:
space:
mode:
authorJonathan Duran2012-02-25 16:17:51 -0800
committerJonathan Duran2012-02-25 16:17:51 -0800
commit1bc2de516c86f67c2107bd50df0589a273f4c5ab (patch)
treebd30d9c6512b47ecdb27695bd5a2900f63e62996 /js/components/hintable.reel
parent9dabdd11b7fc8a042e139457748547ffe2232468 (diff)
parent8125c8c6c9431067840d81c46624b6a2dd5eb4a7 (diff)
downloadninja-1bc2de516c86f67c2107bd50df0589a273f4c5ab.tar.gz
Merge branch 'refs/heads/NINJAmaster' into Timeline
Diffstat (limited to 'js/components/hintable.reel')
-rw-r--r--js/components/hintable.reel/hintable.js6
1 files changed, 6 insertions, 0 deletions
diff --git a/js/components/hintable.reel/hintable.js b/js/components/hintable.reel/hintable.js
index 79813c92..5ed46b3c 100644
--- a/js/components/hintable.reel/hintable.js
+++ b/js/components/hintable.reel/hintable.js
@@ -1,3 +1,9 @@
1/* <copyright>
2 This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
3 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
4 (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
5 </copyright> */
6
1/* ComputedStyleSubPanel.js */ 7/* ComputedStyleSubPanel.js */
2var Montage = require("montage").Montage, 8var Montage = require("montage").Montage,
3 Component = require("montage/ui/component").Component, 9 Component = require("montage/ui/component").Component,