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>

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 @@
-/* <copyright>
- This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
- No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
- (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
- </copyright> */
-var Montage = require("montage").Montage;
-
-var Effect = exports.Effect = Montage.create(Montage, {
-
-    applyEffect: {
-        enumerable: false,
-        value: null
-    }
-
-});