aboutsummaryrefslogtreecommitdiff
path: root/node_modules/montage/ui/flow.reel/flow.js
diff options
context:
space:
mode:
authorValerio Virgillito2012-02-16 22:08:04 -0800
committerValerio Virgillito2012-02-16 22:08:04 -0800
commit0175cb67e426a27a3ecfb7b81317caa383c8a5a5 (patch)
treeb4fbfcaabaadff508ad5463e8f71fd643995aacb /node_modules/montage/ui/flow.reel/flow.js
parentfe71cb9aa1700199c0089166ad54fc56eb760644 (diff)
parent9f0c4efe2ed9a00f2c5d85c9d88a8040fedb5d8f (diff)
downloadninja-0175cb67e426a27a3ecfb7b81317caa383c8a5a5.tar.gz
Merge branch 'refs/heads/master' into components
Diffstat (limited to 'node_modules/montage/ui/flow.reel/flow.js')
-rw-r--r--[-rwxr-xr-x]node_modules/montage/ui/flow.reel/flow.js6
1 files changed, 6 insertions, 0 deletions
diff --git a/node_modules/montage/ui/flow.reel/flow.js b/node_modules/montage/ui/flow.reel/flow.js
index 21556e41..f1311292 100755..100644
--- a/node_modules/montage/ui/flow.reel/flow.js
+++ b/node_modules/montage/ui/flow.reel/flow.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 9