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/panels/Timeline/Span.reel/Span.js | |
parent | 9ef05a0e137d3d38e9a6b5d94851227440ac0fbc (diff) | |
parent | 8125c8c6c9431067840d81c46624b6a2dd5eb4a7 (diff) | |
download | ninja-d392751242f9a4aad4199c941fd416c19c422ee1.tar.gz |
Merge branch 'refs/heads/ninja-internal' into ToolFixes
Diffstat (limited to 'js/panels/Timeline/Span.reel/Span.js')
-rw-r--r-- | js/panels/Timeline/Span.reel/Span.js | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/js/panels/Timeline/Span.reel/Span.js b/js/panels/Timeline/Span.reel/Span.js index 8114e74a..bfa6aab8 100644 --- a/js/panels/Timeline/Span.reel/Span.js +++ b/js/panels/Timeline/Span.reel/Span.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 | 9 | ||