Merge branch 'pentool' into brushtool

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

1 files changed, 0 insertions, 32 deletions

diff --git a/js/io/workflow/newProjectNavigator.reel/newProjectNavigator.css b/js/io/workflow/newProjectNavigator.reel/newProjectNavigator.css
deleted file mode 100644
index b1f490e3..00000000
--- a/js/io/workflow/newProjectNavigator.reel/newProjectNavigator.css
+++ /dev/null
@@ -1,32 +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> */
-
-.container{
-    border: 4px groove #000000;
-    overflow: auto;
-    background-color:#5f5f5f;
-}
-
-.left-nav{
-    float:left;
-}
-
-.right-nav{
-    float:left;
-    width:70%;
-}
-
-.right-top{
-    border: 4px groove #000000;
-    overflow: auto;
-    max-height:150px;
-}
-
-.right-bottom{
-    border: 4px groove #000000;
-    overflow: auto;
-}
-