Merge branch 'pentool' into brushtool

Conflicts:
	imports/codemirror/mode/scheme/scheme.js
	js/tools/BrushTool.js

1 files changed, 0 insertions, 50 deletions

diff --git a/js/io/workflow/newFileDialog/new-file-location.reel/new-file-location.css b/js/io/workflow/newFileDialog/new-file-location.reel/new-file-location.css
deleted file mode 100644
index 1e857874..00000000
--- a/js/io/workflow/newFileDialog/new-file-location.reel/new-file-location.css
+++ /dev/null
@@ -1,50 +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> */
-
-.newfileLocation .newFileName{
-    width:70%;
-    margin-left:5px;
-}
-
-.newfileLocation .newFileDirectory{
-    width:70%;
-    margin-left:5px;
-}
-
-.newfileLocation .templateSelection{
-    float:left;
-    width:20%;
-    height:90%;
-    padding-right: 10px;
-}
-
-.newfileLocation .templateSelection .template{
-    width:80%;
-    height:60%;
-    background-color: #e1e1e1;
-    border:1px solid #000000;
-    box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.8);
-}
-
-.newfileLocation .locationSelection{
-    float:left;
-    width:75%;
-}
-
-.newfileLocation .locationSelection div{
-    padding-bottom: 5px;
-}
-
-.newfileLocation .locationSelection span{
-    padding-right: 5px;
-    white-space: nowrap;
-}
-
-.newfileLocation .findDirectory{
-    width: 17px;
-    height:17px;
-    vertical-align: bottom;
-}
\ No newline at end of file