Merge branch 'refs/heads/master' into components

33 files changed, 0 insertions, 0 deletions

diff --git a/js/panels/Color/colorbutton-manager.js b/js/panels/Color/colorbutton-manager.js
index a189d040..a189d040 100644..100755
--- a/js/panels/Color/colorbutton-manager.js
+++ b/js/panels/Color/colorbutton-manager.js
diff --git a/js/panels/Color/colorchippopup.reel/.sass-cache/2fbca323ccf38cf180e7675ba0d8d3e07adeffea/ColorPanelPopup.scssc b/js/panels/Color/colorchippopup.reel/.sass-cache/2fbca323ccf38cf180e7675ba0d8d3e07adeffea/ColorPanelPopup.scssc
index aa8bf258..aa8bf258 100644..100755
--- a/js/panels/Color/colorchippopup.reel/.sass-cache/2fbca323ccf38cf180e7675ba0d8d3e07adeffea/ColorPanelPopup.scssc
+++ b/js/panels/Color/colorchippopup.reel/.sass-cache/2fbca323ccf38cf180e7675ba0d8d3e07adeffea/ColorPanelPopup.scssc
diff --git a/js/panels/Color/colorchippopup.reel/.sass-cache/6f8390f69a31f1a976968b9c18d0824d78460db2/ColorPanelPopup.scssc b/js/panels/Color/colorchippopup.reel/.sass-cache/6f8390f69a31f1a976968b9c18d0824d78460db2/ColorPanelPopup.scssc
index fca60390..fca60390 100644..100755
--- a/js/panels/Color/colorchippopup.reel/.sass-cache/6f8390f69a31f1a976968b9c18d0824d78460db2/ColorPanelPopup.scssc
+++ b/js/panels/Color/colorchippopup.reel/.sass-cache/6f8390f69a31f1a976968b9c18d0824d78460db2/ColorPanelPopup.scssc
diff --git a/js/panels/Color/colorchippopup.reel/.sass-cache/de22270a8ac487505e8876f1cd16286e094a5127/ColorPanelBase.scssc b/js/panels/Color/colorchippopup.reel/.sass-cache/de22270a8ac487505e8876f1cd16286e094a5127/ColorPanelBase.scssc
index fd7938d8..fd7938d8 100644..100755
--- a/js/panels/Color/colorchippopup.reel/.sass-cache/de22270a8ac487505e8876f1cd16286e094a5127/ColorPanelBase.scssc
+++ b/js/panels/Color/colorchippopup.reel/.sass-cache/de22270a8ac487505e8876f1cd16286e094a5127/ColorPanelBase.scssc
diff --git a/js/panels/Color/colorchippopup.reel/colorchippopup.html b/js/panels/Color/colorchippopup.reel/colorchippopup.html
index 1ae40cc1..1ae40cc1 100644..100755
--- a/js/panels/Color/colorchippopup.reel/colorchippopup.html
+++ b/js/panels/Color/colorchippopup.reel/colorchippopup.html
diff --git a/js/panels/Color/colorchippopup.reel/colorchippopup.js b/js/panels/Color/colorchippopup.reel/colorchippopup.js
index 05bcb447..05bcb447 100644..100755
--- a/js/panels/Color/colorchippopup.reel/colorchippopup.js
+++ b/js/panels/Color/colorchippopup.reel/colorchippopup.js
diff --git a/js/panels/Color/colorchippopup.reel/css/colorchippopup.css b/js/panels/Color/colorchippopup.reel/css/colorchippopup.css
index 514c8e9f..514c8e9f 100644..100755
--- a/js/panels/Color/colorchippopup.reel/css/colorchippopup.css
+++ b/js/panels/Color/colorchippopup.reel/css/colorchippopup.css
diff --git a/js/panels/Color/colorchippopup.reel/img/icon_bitmap.png b/js/panels/Color/colorchippopup.reel/img/icon_bitmap.png
index 3d6bf1fb..3d6bf1fb 100644..100755
--- a/js/panels/Color/colorchippopup.reel/img/icon_bitmap.png
+++ b/js/panels/Color/colorchippopup.reel/img/icon_bitmap.png
diff --git a/js/panels/Color/colorchippopup.reel/img/icon_colorwheel.png b/js/panels/Color/colorchippopup.reel/img/icon_colorwheel.png
index a2850f4f..a2850f4f 100644..100755
--- a/js/panels/Color/colorchippopup.reel/img/icon_colorwheel.png
+++ b/js/panels/Color/colorchippopup.reel/img/icon_colorwheel.png
diff --git a/js/panels/Color/colorchippopup.reel/img/icon_gradient.png b/js/panels/Color/colorchippopup.reel/img/icon_gradient.png
index 887eee13..887eee13 100644..100755
--- a/js/panels/Color/colorchippopup.reel/img/icon_gradient.png
+++ b/js/panels/Color/colorchippopup.reel/img/icon_gradient.png
diff --git a/js/panels/Color/colorchippopup.reel/img/icon_nofill.png b/js/panels/Color/colorchippopup.reel/img/icon_nofill.png
index 0c6311a0..0c6311a0 100644..100755
--- a/js/panels/Color/colorchippopup.reel/img/icon_nofill.png
+++ b/js/panels/Color/colorchippopup.reel/img/icon_nofill.png
diff --git a/js/panels/Color/colorchippopup.reel/img/knob.png b/js/panels/Color/colorchippopup.reel/img/knob.png
index ecfbfcec..ecfbfcec 100644..100755
--- a/js/panels/Color/colorchippopup.reel/img/knob.png
+++ b/js/panels/Color/colorchippopup.reel/img/knob.png
diff --git a/js/panels/Color/colorpanel.js b/js/panels/Color/colorpanel.js
index 4858be68..4858be68 100644..100755
--- a/js/panels/Color/colorpanel.js
+++ b/js/panels/Color/colorpanel.js
diff --git a/js/panels/Color/colorpanelbase.reel/colorpanelbase.html b/js/panels/Color/colorpanelbase.reel/colorpanelbase.html
index d4330596..d4330596 100644..100755
--- a/js/panels/Color/colorpanelbase.reel/colorpanelbase.html
+++ b/js/panels/Color/colorpanelbase.reel/colorpanelbase.html
diff --git a/js/panels/Color/colorpanelbase.reel/colorpanelbase.js b/js/panels/Color/colorpanelbase.reel/colorpanelbase.js
index ff738bbe..ff738bbe 100644..100755
--- a/js/panels/Color/colorpanelbase.reel/colorpanelbase.js
+++ b/js/panels/Color/colorpanelbase.reel/colorpanelbase.js
diff --git a/js/panels/Color/colorpanelbase.reel/css/colorpanelbase.css b/js/panels/Color/colorpanelbase.reel/css/colorpanelbase.css
index e4a0aa12..e4a0aa12 100644..100755
--- a/js/panels/Color/colorpanelbase.reel/css/colorpanelbase.css
+++ b/js/panels/Color/colorpanelbase.reel/css/colorpanelbase.css
diff --git a/js/panels/Color/colorpanelbase.reel/img/icon_default.png b/js/panels/Color/colorpanelbase.reel/img/icon_default.png
index 8e64991f..8e64991f 100644..100755
--- a/js/panels/Color/colorpanelbase.reel/img/icon_default.png
+++ b/js/panels/Color/colorpanelbase.reel/img/icon_default.png
diff --git a/js/panels/Color/colorpanelbase.reel/img/icon_nocolor.png b/js/panels/Color/colorpanelbase.reel/img/icon_nocolor.png
index 17164935..17164935 100644..100755
--- a/js/panels/Color/colorpanelbase.reel/img/icon_nocolor.png
+++ b/js/panels/Color/colorpanelbase.reel/img/icon_nocolor.png
diff --git a/js/panels/Color/colorpanelbase.reel/img/icon_swap.png b/js/panels/Color/colorpanelbase.reel/img/icon_swap.png
index c2c1681d..c2c1681d 100644..100755
--- a/js/panels/Color/colorpanelbase.reel/img/icon_swap.png
+++ b/js/panels/Color/colorpanelbase.reel/img/icon_swap.png
diff --git a/js/panels/Color/colorpanelbase.reel/img/knob.png b/js/panels/Color/colorpanelbase.reel/img/knob.png
index ecfbfcec..ecfbfcec 100644..100755
--- a/js/panels/Color/colorpanelbase.reel/img/knob.png
+++ b/js/panels/Color/colorpanelbase.reel/img/knob.png
diff --git a/js/panels/Color/colorpanelpopup.reel/colorpanelpopup.html b/js/panels/Color/colorpanelpopup.reel/colorpanelpopup.html
index feebb45c..feebb45c 100644..100755
--- a/js/panels/Color/colorpanelpopup.reel/colorpanelpopup.html
+++ b/js/panels/Color/colorpanelpopup.reel/colorpanelpopup.html
diff --git a/js/panels/Color/colorpanelpopup.reel/colorpanelpopup.js b/js/panels/Color/colorpanelpopup.reel/colorpanelpopup.js
index 299e603d..299e603d 100644..100755
--- a/js/panels/Color/colorpanelpopup.reel/colorpanelpopup.js
+++ b/js/panels/Color/colorpanelpopup.reel/colorpanelpopup.js
diff --git a/js/panels/Color/colorpanelpopup.reel/css/colorpanelpopup.css b/js/panels/Color/colorpanelpopup.reel/css/colorpanelpopup.css
index 4db0abff..4db0abff 100644..100755
--- a/js/panels/Color/colorpanelpopup.reel/css/colorpanelpopup.css
+++ b/js/panels/Color/colorpanelpopup.reel/css/colorpanelpopup.css
diff --git a/js/panels/Color/colorpanelpopup.reel/css/colorpanelpopup.scss b/js/panels/Color/colorpanelpopup.reel/css/colorpanelpopup.scss
index 1f63658a..1f63658a 100644..100755
--- a/js/panels/Color/colorpanelpopup.reel/css/colorpanelpopup.scss
+++ b/js/panels/Color/colorpanelpopup.reel/css/colorpanelpopup.scss
diff --git a/js/panels/Color/colorpanelpopup.reel/img/icon_bitmap.png b/js/panels/Color/colorpanelpopup.reel/img/icon_bitmap.png
index 3d6bf1fb..3d6bf1fb 100644..100755
--- a/js/panels/Color/colorpanelpopup.reel/img/icon_bitmap.png
+++ b/js/panels/Color/colorpanelpopup.reel/img/icon_bitmap.png
diff --git a/js/panels/Color/colorpanelpopup.reel/img/icon_colorwheel.png b/js/panels/Color/colorpanelpopup.reel/img/icon_colorwheel.png
index a2850f4f..a2850f4f 100644..100755
--- a/js/panels/Color/colorpanelpopup.reel/img/icon_colorwheel.png
+++ b/js/panels/Color/colorpanelpopup.reel/img/icon_colorwheel.png
diff --git a/js/panels/Color/colorpanelpopup.reel/img/icon_gradient.png b/js/panels/Color/colorpanelpopup.reel/img/icon_gradient.png
index 887eee13..887eee13 100644..100755
--- a/js/panels/Color/colorpanelpopup.reel/img/icon_gradient.png
+++ b/js/panels/Color/colorpanelpopup.reel/img/icon_gradient.png
diff --git a/js/panels/Color/colorpanelpopup.reel/img/icon_nofill.png b/js/panels/Color/colorpanelpopup.reel/img/icon_nofill.png
index 0c6311a0..0c6311a0 100644..100755
--- a/js/panels/Color/colorpanelpopup.reel/img/icon_nofill.png
+++ b/js/panels/Color/colorpanelpopup.reel/img/icon_nofill.png
diff --git a/js/panels/Color/colorpanelpopup.reel/img/knob.png b/js/panels/Color/colorpanelpopup.reel/img/knob.png
index ecfbfcec..ecfbfcec 100644..100755
--- a/js/panels/Color/colorpanelpopup.reel/img/knob.png
+++ b/js/panels/Color/colorpanelpopup.reel/img/knob.png
diff --git a/js/panels/Color/colorpopup-manager.js b/js/panels/Color/colorpopup-manager.js
index a4c9a8c2..a4c9a8c2 100644..100755
--- a/js/panels/Color/colorpopup-manager.js
+++ b/js/panels/Color/colorpopup-manager.js
diff --git a/js/panels/Color/colortoolbar.reel/colortoolbar.html b/js/panels/Color/colortoolbar.reel/colortoolbar.html
index 9ab54836..9ab54836 100644..100755
--- a/js/panels/Color/colortoolbar.reel/colortoolbar.html
+++ b/js/panels/Color/colortoolbar.reel/colortoolbar.html
diff --git a/js/panels/Color/colortoolbar.reel/colortoolbar.js b/js/panels/Color/colortoolbar.reel/colortoolbar.js
index 6b8e476b..6b8e476b 100644..100755
--- a/js/panels/Color/colortoolbar.reel/colortoolbar.js
+++ b/js/panels/Color/colortoolbar.reel/colortoolbar.js
diff --git a/js/panels/Color/colortoolbar.reel/css/colortoolbar.css b/js/panels/Color/colortoolbar.reel/css/colortoolbar.css
index 759ef4f8..759ef4f8 100644..100755
--- a/js/panels/Color/colortoolbar.reel/css/colortoolbar.css
+++ b/js/panels/Color/colortoolbar.reel/css/colortoolbar.css