diff options
author | Armen Kesablyan | 2012-02-07 16:55:34 -0800 |
---|---|---|
committer | Armen Kesablyan | 2012-02-07 16:55:34 -0800 |
commit | 10f0ad4c15f090b2d0d50d11e4c7aaf291e9eb0e (patch) | |
tree | 12b31910a3c7c7fa2ee0b26d8aaa611710e139a5 /node_modules/montage/effect/effect.js | |
parent | 7f8730c3add146f1ba107e6fc22d1f5a8348ed8b (diff) | |
parent | 668510892537eaaeb2e11520831d87b44b2489b7 (diff) | |
download | ninja-10f0ad4c15f090b2d0d50d11e4c7aaf291e9eb0e.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into text-tool
Conflicts:
_scss/compass_app_log.txt
css/ninja.css
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 | }); | ||