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, 27 deletions

diff --git a/node_modules/montage/ui/hottext.reel/hottext.css b/node_modules/montage/ui/hottext.reel/hottext.css
deleted file mode 100755
index 34b353f4..00000000
--- a/node_modules/montage/ui/hottext.reel/hottext.css
+++ /dev/null
@@ -1,27 +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> */
-
-.hottext {
-    cursor: default;
-    border:none;
-    border-bottom:1px dotted white;
-    width:50px;
-    text-align:center;
-    -webkit-user-select:none;
-    outline:none;
-}
-
-.hottext:hover
-{
-    cursor: pointer;
-}
-
-.hottextInput
-{
-    cursor: default;
-    width:50px;
-    text-align:center;
-}
\ No newline at end of file