diff options
author | Jose Antonio Marquez | 2012-02-02 18:00:45 -0800 |
---|---|---|
committer | Jose Antonio Marquez | 2012-02-02 18:00:45 -0800 |
commit | 04d89daed90c35a4393773ca2e2d0ac3a4c15cd4 (patch) | |
tree | d0041abc7379ef38b20cce148e5dea6f531b8569 /node_modules/montage/effect/effect.js | |
parent | 4d8306b638c53899403a4f0328c02bf1ab893e8f (diff) | |
parent | c630ead20487c3948fa36448d3e7d5f7b5cba782 (diff) | |
download | ninja-04d89daed90c35a4393773ca2e2d0ac3a4c15cd4.tar.gz |
Merge branch 'refs/heads/NinjaInternal' into FileIO
Conflicts:
.gitignore
js/ninja.reel/ninja.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 | }); | ||