diff options
author | Ananya Sen | 2012-02-03 09:57:41 -0800 |
---|---|---|
committer | Ananya Sen | 2012-02-03 09:57:41 -0800 |
commit | c093dd13a84ce6eb3e00a672c38a808093c5d966 (patch) | |
tree | 5dfd4a800bbbe02a8cbcb3ffeee542686bc258bb /node_modules/montage/effect/effect.js | |
parent | 79b0173eeca079dec42ff1480182656dbe3af44f (diff) | |
parent | 8e06b63e5eab5558823f4923e20a832c8b36cbe2 (diff) | |
download | ninja-c093dd13a84ce6eb3e00a672c38a808093c5d966.tar.gz |
Merge branch 'FileIO' of github.com:joseeight/ninja-internal into FileIO
Conflicts:
js/io/document/document-controller.js
js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js
js/io/ui/save-as-dialog.reel/save-as-dialog.js
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'node_modules/montage/effect/effect.js')
-rwxr-xr-x | node_modules/montage/effect/effect.js | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/node_modules/montage/effect/effect.js b/node_modules/montage/effect/effect.js deleted file mode 100755 index 4c5bb52c..00000000 --- a/node_modules/montage/effect/effect.js +++ /dev/null | |||
@@ -1,15 +0,0 @@ | |||
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 | var Montage = require("montage").Montage; | ||
7 | |||
8 | var Effect = exports.Effect = Montage.create(Montage, { | ||
9 | |||
10 | applyEffect: { | ||
11 | enumerable: false, | ||
12 | value: null | ||
13 | } | ||
14 | |||
15 | }); | ||