Merge branch 'pentool' into brushtool

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

1 files changed, 10 insertions, 0 deletions

diff --git a/js/components/ui/tree-basic/tree.reel/tree.html b/js/components/ui/tree-basic/tree.reel/tree.html
index ba594926..1990a4ef 100644..100755
--- a/js/components/ui/tree-basic/tree.reel/tree.html
+++ b/js/components/ui/tree-basic/tree.reel/tree.html
@@ -26,6 +26,16 @@
                     "boundObject": {"@": "owner"},
                     "boundObjectPropertyPath": "showIcons",
                     "oneway": true
+                },
+                "expandAfterDraw": {
+                    "boundObject": {"@": "owner"},
+                    "boundObjectPropertyPath": "expandTreeAfterDraw",
+                    "oneway": true
+                },
+                "highlightedUri": {
+                    "boundObject": {"@": "owner"},
+                    "boundObjectPropertyPath": "highlightedUri",
+                    "oneway": true
                 }
             }
         },