diff options
| author | Nivesh Rajbhandari | 2012-02-24 16:48:45 -0800 |
|---|---|---|
| committer | Nivesh Rajbhandari | 2012-02-24 16:48:45 -0800 |
| commit | d392751242f9a4aad4199c941fd416c19c422ee1 (patch) | |
| tree | dceee21c504082896c1ed58e0c3a6a891a4c3e21 /js/components | |
| parent | 9ef05a0e137d3d38e9a6b5d94851227440ac0fbc (diff) | |
| parent | 8125c8c6c9431067840d81c46624b6a2dd5eb4a7 (diff) | |
| download | ninja-d392751242f9a4aad4199c941fd416c19c422ee1.tar.gz | |
Merge branch 'refs/heads/ninja-internal' into ToolFixes
Diffstat (limited to 'js/components')
| -rw-r--r-- | js/components/editable.reel/editable.js | 6 | ||||
| -rw-r--r-- | js/components/hintable.reel/hintable.js | 6 | ||||
| -rwxr-xr-x | js/components/layout/bread-crumb.reel/bread-crumb.js | 5 |
3 files changed, 17 insertions, 0 deletions
diff --git a/js/components/editable.reel/editable.js b/js/components/editable.reel/editable.js index 1d0ad776..9c8946c4 100644 --- a/js/components/editable.reel/editable.js +++ b/js/components/editable.reel/editable.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; |
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, |
diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.js b/js/components/layout/bread-crumb.reel/bread-crumb.js index 1290aaac..1824c7c3 100755 --- a/js/components/layout/bread-crumb.reel/bread-crumb.js +++ b/js/components/layout/bread-crumb.reel/bread-crumb.js | |||
| @@ -1,3 +1,8 @@ | |||
| 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> */ | ||
| 1 | 6 | ||
| 2 | var Montage = require("montage/core/core").Montage, | 7 | var Montage = require("montage/core/core").Montage, |
| 3 | Component = require("montage/ui/component").Component; | 8 | Component = require("montage/ui/component").Component; |