diff options
| author | Jose Antonio Marquez | 2012-02-28 13:33:31 -0800 |
|---|---|---|
| committer | Jose Antonio Marquez | 2012-02-28 13:33:31 -0800 |
| commit | 3a25881b3a463e4f695be2f663f141710ba1d1c1 (patch) | |
| tree | 657d55ad394de168dd627cf89b875906d10584e2 /js/components/hintable.reel/hintable.js | |
| parent | d764428023d87446fbbb153d8e04a23b900d71d5 (diff) | |
| parent | 7c9291a5bab4abd849547f8878f6fb962fc88250 (diff) | |
| download | ninja-3a25881b3a463e4f695be2f663f141710ba1d1c1.tar.gz | |
Merge branch 'refs/heads/NinjaInternal' into Color
Diffstat (limited to 'js/components/hintable.reel/hintable.js')
| -rw-r--r-- | js/components/hintable.reel/hintable.js | 6 |
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 */ |
| 2 | var Montage = require("montage").Montage, | 8 | var Montage = require("montage").Montage, |
| 3 | Component = require("montage/ui/component").Component, | 9 | Component = require("montage/ui/component").Component, |