aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/Span.reel/Span.js
diff options
context:
space:
mode:
authorValerio Virgillito2012-02-24 10:39:39 -0800
committerValerio Virgillito2012-02-24 10:39:39 -0800
commit60845326f5313b7e34f0ad8d9815bc6605ed4c18 (patch)
tree2357eb8c914f57b7da71982d454ca2b4b9a2dee3 /js/panels/Timeline/Span.reel/Span.js
parentafc53c6f553c97ab778154154aa2b7a146cb5fef (diff)
parent23a22195f42f8d7025cd4c70eab9ec26a19c1dc1 (diff)
downloadninja-60845326f5313b7e34f0ad8d9815bc6605ed4c18.tar.gz
Merge branch 'refs/heads/master' into local-storage-version
Diffstat (limited to 'js/panels/Timeline/Span.reel/Span.js')
-rw-r--r--js/panels/Timeline/Span.reel/Span.js6
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
1var Montage = require("montage/core/core").Montage; 7var Montage = require("montage/core/core").Montage;
2var Component = require("montage/ui/component").Component; 8var Component = require("montage/ui/component").Component;
3 9