diff options
author | Jose Antonio Marquez | 2012-02-02 18:04:37 -0800 |
---|---|---|
committer | Jose Antonio Marquez | 2012-02-02 18:04:37 -0800 |
commit | 7959d2ecc6e8b1799307de1ceab1112b8ab58e8d (patch) | |
tree | ce4e32578e1af4d49b8375933a6b7edd0a095b0f /node_modules/montage/effect/effect.js | |
parent | 83ac41dd75ec551cdb03252e0bf3081182517d05 (diff) | |
parent | c630ead20487c3948fa36448d3e7d5f7b5cba782 (diff) | |
download | ninja-7959d2ecc6e8b1799307de1ceab1112b8ab58e8d.tar.gz |
Merge branch 'refs/heads/NinjaInternal' into Color
Conflicts:
js/controllers/elements/shapes-controller.js
js/data/pi/pi-data.js
js/panels/properties/content.reel/content.js
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 | }); | ||