diff options
| author | Jose Antonio Marquez | 2012-02-24 14:51:58 -0800 |
|---|---|---|
| committer | Jose Antonio Marquez | 2012-02-24 14:51:58 -0800 |
| commit | c916a2a5fec0c96bd1c6f56af82543da9b69c33c (patch) | |
| tree | e2219c6fcc7dc3e4168a3c7aad3829a1c954821b /js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | |
| parent | 9a87513929290b6f84a090b4b4cca8fab0f2ab81 (diff) | |
| parent | 8125c8c6c9431067840d81c46624b6a2dd5eb4a7 (diff) | |
| download | ninja-c916a2a5fec0c96bd1c6f56af82543da9b69c33c.tar.gz | |
Merge branch 'refs/heads/NinjaInternal' into FileIO
Diffstat (limited to 'js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js')
| -rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js index 62ae625f..a5cde00f 100644 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js +++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.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 | var Montage = require("montage/core/core").Montage; | 7 | var Montage = require("montage/core/core").Montage; |
| 2 | var Component = require("montage/ui/component").Component; | 8 | var Component = require("montage/ui/component").Component; |
| 3 | var Layer = require("js/panels/Timeline/Layer.reel").Layer; | 9 | var Layer = require("js/panels/Timeline/Layer.reel").Layer; |