aboutsummaryrefslogtreecommitdiff
path: root/js/components/hintable.reel
diff options
context:
space:
mode:
authorJon Reid2012-02-24 13:04:35 -0800
committerJon Reid2012-02-24 13:04:35 -0800
commitae94ea8c3a419ed29fa0c4c16a817e3fea469901 (patch)
tree5f3d5e295fdcc4648e262f35c3efe2dfd5b688b9 /js/components/hintable.reel
parentc615e1d305424f16f64aca16cf38da760a5eec87 (diff)
parent8125c8c6c9431067840d81c46624b6a2dd5eb4a7 (diff)
downloadninja-ae94ea8c3a419ed29fa0c4c16a817e3fea469901.tar.gz
Merge remote-tracking branch 'ninja-internal/master' into Timeline-local
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,