aboutsummaryrefslogtreecommitdiff
path: root/node_modules/montage/ui/scroller.reel
diff options
context:
space:
mode:
authorEric Guzman2012-02-16 14:20:40 -0800
committerEric Guzman2012-02-16 14:20:40 -0800
commit6960f62a84b946c92a59e5f5dc537a818f9f62b8 (patch)
tree49cbff3fdd8dab11846e5a278406915ec0ec1508 /node_modules/montage/ui/scroller.reel
parent82b1a273219f0ae3d119e156c7acccdbe478f441 (diff)
parent81942bd52f0713c9ff5d479ebd12fce577f45e45 (diff)
downloadninja-6960f62a84b946c92a59e5f5dc537a818f9f62b8.tar.gz
Merge branch 'refs/heads/master' into PresetsPanel
Diffstat (limited to 'node_modules/montage/ui/scroller.reel')
-rw-r--r--[-rwxr-xr-x]node_modules/montage/ui/scroller.reel/scroller.html0
-rw-r--r--[-rwxr-xr-x]node_modules/montage/ui/scroller.reel/scroller.js6
2 files changed, 6 insertions, 0 deletions
diff --git a/node_modules/montage/ui/scroller.reel/scroller.html b/node_modules/montage/ui/scroller.reel/scroller.html
index 34e4bc0a..34e4bc0a 100755..100644
--- a/node_modules/montage/ui/scroller.reel/scroller.html
+++ b/node_modules/montage/ui/scroller.reel/scroller.html
diff --git a/node_modules/montage/ui/scroller.reel/scroller.js b/node_modules/montage/ui/scroller.reel/scroller.js
index 32df2906..2dfff059 100755..100644
--- a/node_modules/montage/ui/scroller.reel/scroller.js
+++ b/node_modules/montage/ui/scroller.reel/scroller.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").Montage, 7var Montage = require("montage").Montage,
2 Component = require("ui/component").Component 8 Component = require("ui/component").Component
3 TranslateComposer = require("ui/composer/translate-composer").TranslateComposer; 9 TranslateComposer = require("ui/composer/translate-composer").TranslateComposer;