aboutsummaryrefslogtreecommitdiff
path: root/js/components/editable.reel
diff options
context:
space:
mode:
authorAnanya Sen2012-02-27 14:24:49 -0800
committerAnanya Sen2012-02-27 14:24:49 -0800
commit15d00c49b522aa471d1ccfbbd33f5c0e721eb89e (patch)
tree5c352c198ed7404f3fe0a9c5915e1727d3003f9f /js/components/editable.reel
parent604ace9cfc9fae6b6c121259523a9060c5306161 (diff)
parent7e63b5d0b6990b6c0ec0385d35534b91982ac672 (diff)
downloadninja-15d00c49b522aa471d1ccfbbd33f5c0e721eb89e.tar.gz
Merge branch 'refs/heads/FileIO-jose' into FileIO
Diffstat (limited to 'js/components/editable.reel')
-rw-r--r--js/components/editable.reel/editable.js6
1 files changed, 6 insertions, 0 deletions
diff --git a/js/components/editable.reel/editable.js b/js/components/editable.reel/editable.js
index 1d0ad776..9c8946c4 100644
--- a/js/components/editable.reel/editable.js
+++ b/js/components/editable.reel/editable.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/* ComputedStyleSubPanel.js */ 7/* ComputedStyleSubPanel.js */
2var Montage = require("montage").Montage, 8var Montage = require("montage").Montage,
3 Component = require("montage/ui/component").Component; 9 Component = require("montage/ui/component").Component;