Merge branch 'pentool' into brushtool

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

23 files changed, 0 insertions, 0 deletions

diff --git a/images/panels/project-panel/icon-button-audio.png b/images/panels/project-panel/icon-button-audio.png
index 96a19ab3..96a19ab3 100644..100755
--- a/images/panels/project-panel/icon-button-audio.png
+++ b/images/panels/project-panel/icon-button-audio.png
diff --git a/images/panels/project-panel/icon-button-close.png b/images/panels/project-panel/icon-button-close.png
index 37fd5707..37fd5707 100644..100755
--- a/images/panels/project-panel/icon-button-close.png
+++ b/images/panels/project-panel/icon-button-close.png
diff --git a/images/panels/project-panel/icon-button-component.png b/images/panels/project-panel/icon-button-component.png
index 9fb88ac0..9fb88ac0 100644..100755
--- a/images/panels/project-panel/icon-button-component.png
+++ b/images/panels/project-panel/icon-button-component.png
diff --git a/images/panels/project-panel/icon-button-delete.png b/images/panels/project-panel/icon-button-delete.png
index cfc10484..cfc10484 100644..100755
--- a/images/panels/project-panel/icon-button-delete.png
+++ b/images/panels/project-panel/icon-button-delete.png
diff --git a/images/panels/project-panel/icon-button-flash.png b/images/panels/project-panel/icon-button-flash.png
index 1ea759ab..1ea759ab 100644..100755
--- a/images/panels/project-panel/icon-button-flash.png
+++ b/images/panels/project-panel/icon-button-flash.png
diff --git a/images/panels/project-panel/icon-button-image.png b/images/panels/project-panel/icon-button-image.png
index 3c938f85..3c938f85 100644..100755
--- a/images/panels/project-panel/icon-button-image.png
+++ b/images/panels/project-panel/icon-button-image.png
diff --git a/images/panels/project-panel/icon-button-plus.png b/images/panels/project-panel/icon-button-plus.png
index 83c5ecd9..83c5ecd9 100644..100755
--- a/images/panels/project-panel/icon-button-plus.png
+++ b/images/panels/project-panel/icon-button-plus.png
diff --git a/images/panels/project-panel/icon-button-project.png b/images/panels/project-panel/icon-button-project.png
index 19c63ed7..19c63ed7 100644..100755
--- a/images/panels/project-panel/icon-button-project.png
+++ b/images/panels/project-panel/icon-button-project.png
diff --git a/images/panels/project-panel/icon-button-script.png b/images/panels/project-panel/icon-button-script.png
index 544a64bb..544a64bb 100644..100755
--- a/images/panels/project-panel/icon-button-script.png
+++ b/images/panels/project-panel/icon-button-script.png
diff --git a/images/panels/project-panel/icon-button-search.png b/images/panels/project-panel/icon-button-search.png
index 6dc6e18f..6dc6e18f 100644..100755
--- a/images/panels/project-panel/icon-button-search.png
+++ b/images/panels/project-panel/icon-button-search.png
diff --git a/images/panels/project-panel/icon-button-selected.png b/images/panels/project-panel/icon-button-selected.png
index 990dd953..990dd953 100644..100755
--- a/images/panels/project-panel/icon-button-selected.png
+++ b/images/panels/project-panel/icon-button-selected.png
diff --git a/images/panels/project-panel/icon-button-showall.png b/images/panels/project-panel/icon-button-showall.png
index dabf497e..dabf497e 100644..100755
--- a/images/panels/project-panel/icon-button-showall.png
+++ b/images/panels/project-panel/icon-button-showall.png
diff --git a/images/panels/project-panel/icon-button-tag.png b/images/panels/project-panel/icon-button-tag.png
index bdb1a325..bdb1a325 100644..100755
--- a/images/panels/project-panel/icon-button-tag.png
+++ b/images/panels/project-panel/icon-button-tag.png
diff --git a/images/panels/project-panel/icon-button-video.png b/images/panels/project-panel/icon-button-video.png
index a822ea16..a822ea16 100644..100755
--- a/images/panels/project-panel/icon-button-video.png
+++ b/images/panels/project-panel/icon-button-video.png
diff --git a/images/panels/project-panel/icon-file-audio.png b/images/panels/project-panel/icon-file-audio.png
index ee1f75f9..ee1f75f9 100644..100755
--- a/images/panels/project-panel/icon-file-audio.png
+++ b/images/panels/project-panel/icon-file-audio.png
diff --git a/images/panels/project-panel/icon-file-flash.png b/images/panels/project-panel/icon-file-flash.png
index 8bf0bdd2..8bf0bdd2 100644..100755
--- a/images/panels/project-panel/icon-file-flash.png
+++ b/images/panels/project-panel/icon-file-flash.png
diff --git a/images/panels/project-panel/icon-file-folderclosed.png b/images/panels/project-panel/icon-file-folderclosed.png
index 0ef1c2b9..0ef1c2b9 100644..100755
--- a/images/panels/project-panel/icon-file-folderclosed.png
+++ b/images/panels/project-panel/icon-file-folderclosed.png
diff --git a/images/panels/project-panel/icon-file-folderopen.png b/images/panels/project-panel/icon-file-folderopen.png
index ba2ce47f..ba2ce47f 100644..100755
--- a/images/panels/project-panel/icon-file-folderopen.png
+++ b/images/panels/project-panel/icon-file-folderopen.png
diff --git a/images/panels/project-panel/icon-file-image.png b/images/panels/project-panel/icon-file-image.png
index f905abba..f905abba 100644..100755
--- a/images/panels/project-panel/icon-file-image.png
+++ b/images/panels/project-panel/icon-file-image.png
diff --git a/images/panels/project-panel/icon-file-misc.png b/images/panels/project-panel/icon-file-misc.png
index 9b324f65..9b324f65 100644..100755
--- a/images/panels/project-panel/icon-file-misc.png
+++ b/images/panels/project-panel/icon-file-misc.png
diff --git a/images/panels/project-panel/icon-file-script.png b/images/panels/project-panel/icon-file-script.png
index 03bc5090..03bc5090 100644..100755
--- a/images/panels/project-panel/icon-file-script.png
+++ b/images/panels/project-panel/icon-file-script.png
diff --git a/images/panels/project-panel/icon-file-video.png b/images/panels/project-panel/icon-file-video.png
index d4f1b489..d4f1b489 100644..100755
--- a/images/panels/project-panel/icon-file-video.png
+++ b/images/panels/project-panel/icon-file-video.png
diff --git a/images/panels/project-panel/icon-sort-arrow.png b/images/panels/project-panel/icon-sort-arrow.png
index 2fddba2a..2fddba2a 100644..100755
--- a/images/panels/project-panel/icon-sort-arrow.png
+++ b/images/panels/project-panel/icon-sort-arrow.png