diff options
| author | Pushkar Joshi | 2012-02-24 12:03:51 -0800 |
|---|---|---|
| committer | Pushkar Joshi | 2012-02-24 12:03:51 -0800 |
| commit | 053fc63a2950c7a5ee4ebf98033b64d474a3c46e (patch) | |
| tree | 8cfd5c51f72624ff1da50f3a2fbed05644ffd8e2 /js/components/editable.reel/editable.js | |
| parent | a5ba66ecefa9c9c17e0f5e1725e2141f7a3540a2 (diff) | |
| parent | 23a22195f42f8d7025cd4c70eab9ec26a19c1dc1 (diff) | |
| download | ninja-053fc63a2950c7a5ee4ebf98033b64d474a3c46e.tar.gz | |
Merge branch 'master' into pentool
Diffstat (limited to 'js/components/editable.reel/editable.js')
| -rw-r--r-- | js/components/editable.reel/editable.js | 6 |
1 files changed, 6 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; |