Merge branch 'master' into spot-removal-tool

2016-12-28 01:57:46 +01:00
parent 6b22cbd831 cc8dae26ff
commit 3eeeb151ec
383 changed files with 30405 additions and 10838 deletions
--- a/tools/source_icons/scalable/colorPickers-hide.file
+++ b/tools/source_icons/scalable/colorPickers-hide.file
@@ -0,0 +1 @@
+colorPickers-hide.png,w22,actions
--- a/tools/source_icons/scalable/colorPickers-hide.svg
+++ b/tools/source_icons/scalable/colorPickers-hide.svg
--- a/tools/source_icons/scalable/colorPickers-show.file
+++ b/tools/source_icons/scalable/colorPickers-show.file
@@ -0,0 +1 @@
+colorPickers-show.png,w22,actions
--- a/tools/source_icons/scalable/colorPickers-show.svg
+++ b/tools/source_icons/scalable/colorPickers-show.svg
--- a/tools/source_icons/scalable/gtk-color-picker-add.file
+++ b/tools/source_icons/scalable/gtk-color-picker-add.file
@@ -0,0 +1 @@
+gtk-color-picker-add.png,w22,actions
--- a/tools/source_icons/scalable/gtk-color-picker-add.svg
+++ b/tools/source_icons/scalable/gtk-color-picker-add.svg
--- a/tools/source_icons/scalable/spGamutCheck.file
+++ b/tools/source_icons/scalable/spGamutCheck.file
@@ -0,0 +1 @@
+spGamutCheck.png,w22,actions
--- a/tools/source_icons/scalable/spGamutCheck.svg
+++ b/tools/source_icons/scalable/spGamutCheck.svg
--- a/tools/source_icons/scalable/unchanged.file
+++ b/tools/source_icons/scalable/unchanged.file
@@ -0,0 +1,2 @@
+unchanged-22.png,w22,actions
+unchanged-18.png,w18,actions
--- a/tools/source_icons/scalable/unchanged.svg
+++ b/tools/source_icons/scalable/unchanged.svg