Merge branch 'pentool' into brushtool

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

1 files changed, 0 insertions, 201 deletions

diff --git a/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.css b/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.css
deleted file mode 100644
index 2d9f1189..00000000
--- a/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.css
+++ /dev/null
@@ -1,201 +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> */
-
-.picker{
-    font-size:12px;
-    width:510px;
-    height:500px;
-    padding-top:15px;
-    padding-left:15px;
-    padding-bottom:15px;
-    color:#ffffff;
-    background-color:#313131;
-}
-
-.picker .pickerHeader{
-    margin-bottom: 10px;
-}
-
-.picker .container{
-    border: 1px groove #000000;
-    overflow: auto;
-    background-color:#5f5f5f;
-}
-
-.picker .left-nav{
-    float:left;
-    width:20%;
-    height:86%;
-    padding-top: 10px;
-    overflow-x:hidden;
-    overflow-y:auto
-}
-
-.picker .right-nav{
-    float:left;
-    width:75%;
-    height:88%;
-    overflow: hidden;
-}
-
-.picker .right-top{
-    border: 1px groove #000000;
-    overflow: auto;
-    min-height:150px;
-    height:75%;
-    width:auto;
-}
-
-.picker .right-bottom{
-    border: 1px groove #000000;
-    overflow: auto;
-    height:20%;
-    padding: 10px;
-}
-
-.picker .driversList{
-    padding: 3px;
-    text-align: center;
-}
-
-.picker .driversList:hover{
-    cursor:pointer;
-}
-
-.picker .highlighted{
-    background-color: #343434;
-}
-
-
-.picker .buttons{
-    float:right;
-    margin-top: 7px;
-}
-
-.picker .historyArrows{
-    width:20px;
-    display:inline;
-    border-radius: 5px;
-    border: 1px solid #d1d1d1;
-}
-
-.picker .historyArrows span{
-    font-size: 0.7em;
-    cursor: pointer;
-}
-
-.picker .addressbar{
-    display:inline;
-    margin-left: 2px;
-    border-radius: 5px;
-    border: 1px solid #d1d1d1;
-    padding: 3px;
-    position:relative;
-}
-
-.picker .addressbar input{
-    width:320px;
-}
-
-.picker .dropdownArrow{
-    font-size: 0.7em;
-    cursor: pointer;
-}
-
-.picker .dropdown{
-    position:absolute;
-    z-index:10000;
-    border: 1px solid #d1d1d1;
-    background-color: #444;
-    opacity:0.9;
-}
-
-.picker .dropdown div{
-    padding: 3px;
-}
-
-.picker .dropdown div:hover{
-    cursor: pointer;
-    background-color: #343434;
-}
-
-.picker .addressbar .dropdown{
-    width:331px;
-    min-height:50px;
-}
-
-.picker .go{
-    margin-left: 5px;
-    cursor: pointer;
-}
-
-.picker .viewSwitcher{
-    display:inline;
-    margin-left: 30px;
-}
-
-.picker .viewSwitcher span{
-    margin-left: 5px;
-    border-radius: 5px;
-    border: 1px solid #d1d1d1;
-    padding: 3px;
-    cursor: pointer;
-}
-
-.picker .reload{
-    position:relative;
-    margin-left: 15px;
-    top:4px;
-    cursor: pointer;
-}
-
-.picker .filters{
-    display:inline;
-    float:left;
-    margin-left: 12px;
-    margin-top: 7px;
-    border-radius: 5px;
-    border: 1px solid #d1d1d1;
-    padding: 3px;
-    /*width:150px;*/
-    position:relative;
-    max-width: 65%;
-}
-
-.picker .filters .dropdown{
-    min-height:25px;
-    /*width:154px;*/
-    bottom:21px;
-    left:-1px;
-    white-space: nowrap;
-}
-
-.picker .filterVal{
-    width:120px;
-    margin-left: 5px;
-    background-color: #444;
-}
-
-.picker .disable{
-    color:#5f5f5f;
-    cursor:auto;
-}
-
-.picker .hide{
-    display: none;
-}
-
-.picker .viewSelected{
-    background-color:#6f6f6f;
-    pointer:auto;
-}
-
-.picker .okButton{
-    margin-right:25px;
-}
-
-
-