[gimp/gimp-attributes-wip: 13/16] Merge remote-tracking branch 'remotes/origin/master' into gimp-attributes-wip
- From: Hartmut Kuhse <hartmutkuhse src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/gimp-attributes-wip: 13/16] Merge remote-tracking branch 'remotes/origin/master' into gimp-attributes-wip
- Date: Sun, 1 May 2016 17:02:48 +0000 (UTC)
commit 41c129eb47820946ea7740a9d526c3a82cd83695
Merge: 2bd0b5c bbbc103
Author: Hartmut Kuhse <hk_priv gmx de>
Date: Sat Apr 2 21:40:19 2016 +0200
Merge remote-tracking branch 'remotes/origin/master' into gimp-attributes-wip
icons/Color/22/gimp-tool-airbrush.png | Bin 1169 -> 0 bytes
icons/Color/22/gimp-tool-align.png | Bin 646 -> 0 bytes
icons/Color/22/gimp-tool-blend.png | Bin 566 -> 0 bytes
icons/Color/22/gimp-tool-blur.png | Bin 1100 -> 0 bytes
icons/Color/22/gimp-tool-brightness-contrast.png | Bin 1098 -> 0 bytes
icons/Color/22/gimp-tool-bucket-fill.png | Bin 1396 -> 0 bytes
icons/Color/22/gimp-tool-by-color-select.png | Bin 1445 -> 0 bytes
icons/Color/22/gimp-tool-cage.png | Bin 1604 -> 0 bytes
icons/Color/22/gimp-tool-clone.png | Bin 1130 -> 0 bytes
icons/Color/22/gimp-tool-color-balance.png | Bin 912 -> 0 bytes
icons/Color/22/gimp-tool-color-picker.png | Bin 912 -> 0 bytes
icons/Color/22/gimp-tool-colorize.png | Bin 628 -> 0 bytes
icons/Color/22/gimp-tool-crop.png | Bin 1079 -> 0 bytes
icons/Color/22/gimp-tool-curves.png | Bin 1421 -> 0 bytes
icons/Color/22/gimp-tool-desaturate.png | Bin 769 -> 0 bytes
icons/Color/22/gimp-tool-dodge.png | Bin 942 -> 0 bytes
icons/Color/22/gimp-tool-ellipse-select.png | Bin 1138 -> 0 bytes
icons/Color/22/gimp-tool-eraser.png | Bin 830 -> 0 bytes
icons/Color/22/gimp-tool-flip.png | Bin 1073 -> 0 bytes
icons/Color/22/gimp-tool-foreground-select.png | Bin 1256 -> 0 bytes
icons/Color/22/gimp-tool-free-select.png | Bin 1227 -> 0 bytes
icons/Color/22/gimp-tool-fuzzy-select.png | Bin 1217 -> 0 bytes
icons/Color/22/gimp-tool-handle-transform.png | Bin 1342 -> 0 bytes
icons/Color/22/gimp-tool-heal.png | Bin 1430 -> 0 bytes
icons/Color/22/gimp-tool-hue-saturation.png | Bin 783 -> 0 bytes
icons/Color/22/gimp-tool-ink.png | Bin 1228 -> 0 bytes
icons/Color/22/gimp-tool-iscissors.png | Bin 1391 -> 0 bytes
icons/Color/22/gimp-tool-levels.png | Bin 899 -> 0 bytes
icons/Color/22/gimp-tool-measure.png | Bin 1211 -> 0 bytes
icons/Color/22/gimp-tool-move.png | Bin 1108 -> 0 bytes
icons/Color/22/gimp-tool-mypaint-brush.png | Bin 1034 -> 0 bytes
icons/Color/22/gimp-tool-n-point-deformation.png | Bin 1170 -> 0 bytes
icons/Color/22/gimp-tool-paintbrush.png | Bin 907 -> 0 bytes
icons/Color/22/gimp-tool-path.png | Bin 1231 -> 0 bytes
icons/Color/22/gimp-tool-pencil.png | Bin 925 -> 0 bytes
icons/Color/22/gimp-tool-perspective-clone.png | Bin 1177 -> 0 bytes
icons/Color/22/gimp-tool-perspective.png | Bin 914 -> 0 bytes
icons/Color/22/gimp-tool-posterize.png | Bin 503 -> 0 bytes
icons/Color/22/gimp-tool-preset.png | Bin 1548 -> 0 bytes
icons/Color/22/gimp-tool-rect-select.png | Bin 934 -> 0 bytes
icons/Color/22/gimp-tool-rotate.png | Bin 1308 -> 0 bytes
icons/Color/22/gimp-tool-scale.png | Bin 1118 -> 0 bytes
icons/Color/22/gimp-tool-seamless-clone.png | Bin 1190 -> 0 bytes
icons/Color/22/gimp-tool-shear.png | Bin 1045 -> 0 bytes
icons/Color/22/gimp-tool-smudge.png | Bin 1030 -> 0 bytes
icons/Color/22/gimp-tool-text.png | Bin 1069 -> 0 bytes
icons/Color/22/gimp-tool-threshold.png | Bin 874 -> 0 bytes
icons/Color/22/gimp-tool-unified-transform.png | Bin 1092 -> 0 bytes
icons/Color/22/gimp-tool-warp.png | Bin 1192 -> 0 bytes
icons/Color/22/gimp-tool-zoom.png | Bin 1328 -> 0 bytes
icons/Color/24/gimp-tool-airbrush.png | Bin 0 -> 1328 bytes
icons/Color/24/gimp-tool-align.png | Bin 0 -> 686 bytes
icons/Color/24/gimp-tool-blend.png | Bin 0 -> 1587 bytes
icons/Color/24/gimp-tool-blur.png | Bin 0 -> 1318 bytes
icons/Color/24/gimp-tool-brightness-contrast.png | Bin 0 -> 1179 bytes
icons/Color/24/gimp-tool-bucket-fill.png | Bin 0 -> 1632 bytes
icons/Color/24/gimp-tool-by-color-select.png | Bin 0 -> 1491 bytes
icons/Color/24/gimp-tool-cage.png | Bin 0 -> 1732 bytes
icons/Color/24/gimp-tool-clone.png | Bin 0 -> 1264 bytes
icons/Color/24/gimp-tool-color-balance.png | Bin 0 -> 989 bytes
icons/Color/24/gimp-tool-color-picker.png | Bin 0 -> 1073 bytes
icons/Color/24/gimp-tool-colorize.png | Bin 0 -> 740 bytes
icons/Color/24/gimp-tool-crop.png | Bin 0 -> 1286 bytes
icons/Color/24/gimp-tool-curves.png | Bin 0 -> 1562 bytes
icons/Color/24/gimp-tool-desaturate.png | Bin 0 -> 1300 bytes
icons/Color/24/gimp-tool-dodge.png | Bin 0 -> 1155 bytes
icons/Color/24/gimp-tool-ellipse-select.png | Bin 0 -> 1266 bytes
icons/Color/24/gimp-tool-eraser.png | Bin 0 -> 1120 bytes
icons/Color/24/gimp-tool-flip.png | Bin 0 -> 1209 bytes
icons/Color/24/gimp-tool-foreground-select.png | Bin 0 -> 1330 bytes
icons/Color/24/gimp-tool-free-select.png | Bin 0 -> 1381 bytes
icons/Color/24/gimp-tool-fuzzy-select.png | Bin 0 -> 1356 bytes
icons/Color/24/gimp-tool-handle-transform.png | Bin 0 -> 1499 bytes
icons/Color/24/gimp-tool-heal.png | Bin 0 -> 1638 bytes
icons/Color/24/gimp-tool-hue-saturation.png | Bin 0 -> 823 bytes
icons/Color/24/gimp-tool-ink.png | Bin 0 -> 1334 bytes
icons/Color/24/gimp-tool-iscissors.png | Bin 0 -> 1656 bytes
icons/Color/24/gimp-tool-levels.png | Bin 0 -> 892 bytes
icons/Color/24/gimp-tool-measure.png | Bin 0 -> 1327 bytes
icons/Color/24/gimp-tool-move.png | Bin 0 -> 1212 bytes
icons/Color/24/gimp-tool-mypaint-brush.png | Bin 0 -> 1179 bytes
icons/Color/24/gimp-tool-n-point-deformation.png | Bin 0 -> 1358 bytes
icons/Color/24/gimp-tool-paintbrush.png | Bin 0 -> 1110 bytes
icons/Color/24/gimp-tool-path.png | Bin 0 -> 1324 bytes
icons/Color/24/gimp-tool-pencil.png | Bin 0 -> 1111 bytes
icons/Color/24/gimp-tool-perspective-clone.png | Bin 0 -> 1404 bytes
icons/Color/24/gimp-tool-perspective.png | Bin 0 -> 1402 bytes
icons/Color/24/gimp-tool-posterize.png | Bin 0 -> 457 bytes
icons/Color/24/gimp-tool-rect-select.png | Bin 0 -> 996 bytes
icons/Color/24/gimp-tool-rotate.png | Bin 0 -> 1463 bytes
icons/Color/24/gimp-tool-scale.png | Bin 0 -> 1395 bytes
icons/Color/24/gimp-tool-seamless-clone.png | Bin 0 -> 1405 bytes
icons/Color/24/gimp-tool-shear.png | Bin 0 -> 1215 bytes
icons/Color/24/gimp-tool-smudge.png | Bin 0 -> 1173 bytes
icons/Color/24/gimp-tool-text.png | Bin 0 -> 1208 bytes
icons/Color/24/gimp-tool-threshold.png | Bin 0 -> 936 bytes
icons/Color/24/gimp-tool-unified-transform.png | Bin 0 -> 1235 bytes
icons/Color/24/gimp-tool-warp.png | Bin 0 -> 1153 bytes
icons/Color/24/gimp-tool-zoom.png | Bin 0 -> 1517 bytes
icons/Symbolic/22/gimp-tool-airbrush.png | Bin 762 -> 0 bytes
icons/Symbolic/22/gimp-tool-align.png | Bin 384 -> 0 bytes
icons/Symbolic/22/gimp-tool-blend.png | Bin 888 -> 0 bytes
icons/Symbolic/22/gimp-tool-blur.png | Bin 550 -> 0 bytes
.../Symbolic/22/gimp-tool-brightness-contrast.png | Bin 696 -> 0 bytes
icons/Symbolic/22/gimp-tool-bucket-fill.png | Bin 860 -> 0 bytes
icons/Symbolic/22/gimp-tool-by-color-select.png | Bin 1167 -> 0 bytes
icons/Symbolic/22/gimp-tool-cage.png | Bin 913 -> 0 bytes
icons/Symbolic/22/gimp-tool-clone.png | Bin 554 -> 0 bytes
icons/Symbolic/22/gimp-tool-color-balance.png | Bin 591 -> 0 bytes
icons/Symbolic/22/gimp-tool-color-picker.png | Bin 668 -> 0 bytes
icons/Symbolic/22/gimp-tool-colorize.png | Bin 513 -> 0 bytes
icons/Symbolic/22/gimp-tool-crop.png | Bin 610 -> 0 bytes
icons/Symbolic/22/gimp-tool-curves.png | Bin 689 -> 0 bytes
icons/Symbolic/22/gimp-tool-desaturate.png | Bin 698 -> 0 bytes
icons/Symbolic/22/gimp-tool-dodge.png | Bin 811 -> 0 bytes
icons/Symbolic/22/gimp-tool-ellipse-select.png | Bin 761 -> 0 bytes
icons/Symbolic/22/gimp-tool-eraser.png | Bin 808 -> 0 bytes
icons/Symbolic/22/gimp-tool-flip.png | Bin 502 -> 0 bytes
icons/Symbolic/22/gimp-tool-foreground-select.png | Bin 894 -> 0 bytes
icons/Symbolic/22/gimp-tool-free-select.png | Bin 890 -> 0 bytes
icons/Symbolic/22/gimp-tool-fuzzy-select.png | Bin 655 -> 0 bytes
icons/Symbolic/22/gimp-tool-handle-transform.png | Bin 806 -> 0 bytes
icons/Symbolic/22/gimp-tool-heal.png | Bin 931 -> 0 bytes
icons/Symbolic/22/gimp-tool-hue-saturation.png | Bin 737 -> 0 bytes
icons/Symbolic/22/gimp-tool-ink.png | Bin 681 -> 0 bytes
icons/Symbolic/22/gimp-tool-iscissors.png | Bin 865 -> 0 bytes
icons/Symbolic/22/gimp-tool-levels.png | Bin 544 -> 0 bytes
icons/Symbolic/22/gimp-tool-measure.png | Bin 1047 -> 0 bytes
icons/Symbolic/22/gimp-tool-move.png | Bin 595 -> 0 bytes
icons/Symbolic/22/gimp-tool-mypaint-brush.png | Bin 929 -> 0 bytes
.../Symbolic/22/gimp-tool-n-point-deformation.png | Bin 1005 -> 0 bytes
icons/Symbolic/22/gimp-tool-paintbrush.png | Bin 636 -> 0 bytes
icons/Symbolic/22/gimp-tool-path.png | Bin 866 -> 0 bytes
icons/Symbolic/22/gimp-tool-pencil.png | Bin 673 -> 0 bytes
icons/Symbolic/22/gimp-tool-perspective-clone.png | Bin 795 -> 0 bytes
icons/Symbolic/22/gimp-tool-perspective.png | Bin 864 -> 0 bytes
icons/Symbolic/22/gimp-tool-posterize.png | Bin 584 -> 0 bytes
icons/Symbolic/22/gimp-tool-preset.png | Bin 883 -> 0 bytes
icons/Symbolic/22/gimp-tool-rect-select.png | Bin 533 -> 0 bytes
icons/Symbolic/22/gimp-tool-rotate.png | Bin 710 -> 0 bytes
icons/Symbolic/22/gimp-tool-scale.png | Bin 476 -> 0 bytes
icons/Symbolic/22/gimp-tool-seamless-clone.png | Bin 758 -> 0 bytes
icons/Symbolic/22/gimp-tool-shear.png | Bin 720 -> 0 bytes
icons/Symbolic/22/gimp-tool-smudge.png | Bin 701 -> 0 bytes
icons/Symbolic/22/gimp-tool-text.png | Bin 663 -> 0 bytes
icons/Symbolic/22/gimp-tool-threshold.png | Bin 631 -> 0 bytes
icons/Symbolic/22/gimp-tool-unified-transform.png | Bin 710 -> 0 bytes
icons/Symbolic/22/gimp-tool-warp.png | Bin 586 -> 0 bytes
icons/Symbolic/24/gimp-tool-airbrush.png | Bin 0 -> 859 bytes
icons/Symbolic/24/gimp-tool-align.png | Bin 0 -> 333 bytes
icons/Symbolic/24/gimp-tool-blend.png | Bin 0 -> 507 bytes
icons/Symbolic/24/gimp-tool-blur.png | Bin 0 -> 679 bytes
.../Symbolic/24/gimp-tool-brightness-contrast.png | Bin 0 -> 807 bytes
icons/Symbolic/24/gimp-tool-bucket-fill.png | Bin 0 -> 850 bytes
icons/Symbolic/24/gimp-tool-by-color-select.png | Bin 0 -> 719 bytes
icons/Symbolic/24/gimp-tool-cage.png | Bin 0 -> 923 bytes
icons/Symbolic/24/gimp-tool-clone.png | Bin 0 -> 614 bytes
icons/Symbolic/24/gimp-tool-color-balance.png | Bin 0 -> 356 bytes
icons/Symbolic/24/gimp-tool-color-picker.png | Bin 0 -> 751 bytes
icons/Symbolic/24/gimp-tool-colorize.png | Bin 0 -> 554 bytes
icons/Symbolic/24/gimp-tool-crop.png | Bin 0 -> 500 bytes
icons/Symbolic/24/gimp-tool-curves.png | Bin 0 -> 796 bytes
icons/Symbolic/24/gimp-tool-desaturate.png | Bin 0 -> 530 bytes
icons/Symbolic/24/gimp-tool-dodge.png | Bin 0 -> 841 bytes
icons/Symbolic/24/gimp-tool-ellipse-select.png | Bin 0 -> 864 bytes
icons/Symbolic/24/gimp-tool-eraser.png | Bin 0 -> 823 bytes
icons/Symbolic/24/gimp-tool-flip.png | Bin 0 -> 505 bytes
icons/Symbolic/24/gimp-tool-foreground-select.png | Bin 0 -> 548 bytes
icons/Symbolic/24/gimp-tool-free-select.png | Bin 0 -> 946 bytes
icons/Symbolic/24/gimp-tool-fuzzy-select.png | Bin 0 -> 717 bytes
icons/Symbolic/24/gimp-tool-handle-transform.png | Bin 0 -> 701 bytes
icons/Symbolic/24/gimp-tool-heal.png | Bin 0 -> 1111 bytes
icons/Symbolic/24/gimp-tool-hue-saturation.png | Bin 0 -> 528 bytes
icons/Symbolic/24/gimp-tool-ink.png | Bin 0 -> 775 bytes
icons/Symbolic/24/gimp-tool-iscissors.png | Bin 0 -> 943 bytes
icons/Symbolic/24/gimp-tool-levels.png | Bin 0 -> 542 bytes
icons/Symbolic/24/gimp-tool-measure.png | Bin 0 -> 1094 bytes
icons/Symbolic/24/gimp-tool-move.png | Bin 0 -> 658 bytes
icons/Symbolic/24/gimp-tool-mypaint-brush.png | Bin 0 -> 952 bytes
.../Symbolic/24/gimp-tool-n-point-deformation.png | Bin 0 -> 976 bytes
icons/Symbolic/24/gimp-tool-paintbrush.png | Bin 0 -> 743 bytes
icons/Symbolic/24/gimp-tool-path.png | Bin 0 -> 707 bytes
icons/Symbolic/24/gimp-tool-pencil.png | Bin 0 -> 760 bytes
icons/Symbolic/24/gimp-tool-perspective-clone.png | Bin 0 -> 709 bytes
icons/Symbolic/24/gimp-tool-perspective.png | Bin 0 -> 762 bytes
icons/Symbolic/24/gimp-tool-posterize.png | Bin 0 -> 390 bytes
icons/Symbolic/24/gimp-tool-rect-select.png | Bin 0 -> 328 bytes
icons/Symbolic/24/gimp-tool-rotate.png | Bin 0 -> 766 bytes
icons/Symbolic/24/gimp-tool-scale.png | Bin 0 -> 556 bytes
icons/Symbolic/24/gimp-tool-seamless-clone.png | Bin 0 -> 629 bytes
icons/Symbolic/24/gimp-tool-shear.png | Bin 0 -> 685 bytes
icons/Symbolic/24/gimp-tool-smudge.png | Bin 0 -> 782 bytes
icons/Symbolic/24/gimp-tool-text.png | Bin 0 -> 731 bytes
icons/Symbolic/24/gimp-tool-threshold.png | Bin 0 -> 553 bytes
icons/Symbolic/24/gimp-tool-unified-transform.png | Bin 0 -> 611 bytes
icons/Symbolic/24/gimp-tool-warp.png | Bin 0 -> 643 bytes
icons/Symbolic/24/gimp-tool-zoom.png | Bin 0 -> 916 bytes
icons/Symbolic/scalable/gimp-tool-airbrush-24.svg | 353 +
icons/Symbolic/scalable/gimp-tool-align-24.svg | 159 +
icons/Symbolic/scalable/gimp-tool-blend-24.svg | 368 +
icons/Symbolic/scalable/gimp-tool-blur-24.svg | 476 +
.../scalable/gimp-tool-brightness-contrast-24.svg | 129 +
.../Symbolic/scalable/gimp-tool-bucket-fill-24.svg | 119 +
.../scalable/gimp-tool-by-color-select-24.svg | 438 +
icons/Symbolic/scalable/gimp-tool-cage-24.svg | 198 +
icons/Symbolic/scalable/gimp-tool-clone-24.svg | 159 +
.../scalable/gimp-tool-color-balance-24.svg | 260 +
.../scalable/gimp-tool-color-picker-24.svg | 160 +
icons/Symbolic/scalable/gimp-tool-colorize-24.svg | 152 +
icons/Symbolic/scalable/gimp-tool-crop-24.svg | 148 +
icons/Symbolic/scalable/gimp-tool-curves-24.svg | 126 +
.../Symbolic/scalable/gimp-tool-desaturate-24.svg | 156 +
icons/Symbolic/scalable/gimp-tool-dodge-24a.svg | 112 +
.../scalable/gimp-tool-ellipse-select-24.svg | 141 +
icons/Symbolic/scalable/gimp-tool-eraser-24.svg | 180 +
icons/Symbolic/scalable/gimp-tool-flip-24.svg | 141 +
.../scalable/gimp-tool-foreground-select-24.svg | 1149 +
.../Symbolic/scalable/gimp-tool-free-select-24.svg | 495 +
.../scalable/gimp-tool-fuzzy-select-24.svg | 152 +
.../scalable/gimp-tool-handle-transform-24.svg | 144 +
icons/Symbolic/scalable/gimp-tool-heal-24.svg | 138 +
.../scalable/gimp-tool-hue-saturation-24.svg | 705 +
icons/Symbolic/scalable/gimp-tool-ink-24.svg | 142 +
icons/Symbolic/scalable/gimp-tool-iscissors-24.svg | 273 +
icons/Symbolic/scalable/gimp-tool-levels-24.svg | 497 +
icons/Symbolic/scalable/gimp-tool-measure-24.svg | 118 +
icons/Symbolic/scalable/gimp-tool-move-24.svg | 122 +
.../scalable/gimp-tool-mypaint-brush-24.svg | 172 +
.../scalable/gimp-tool-n-point-deformation-24.svg | 118 +
.../Symbolic/scalable/gimp-tool-paintbrush-24.svg | 146 +
icons/Symbolic/scalable/gimp-tool-path-24.svg | 198 +
icons/Symbolic/scalable/gimp-tool-pencil-24.svg | 142 +
.../Symbolic/scalable/gimp-tool-perspective-24.svg | 307 +
.../scalable/gimp-tool-perspective-clone-24.svg | 189 +
icons/Symbolic/scalable/gimp-tool-posterize-24.svg | 662 +
.../Symbolic/scalable/gimp-tool-rect-select-24.svg | 439 +
icons/Symbolic/scalable/gimp-tool-rotate-24.svg | 161 +
icons/Symbolic/scalable/gimp-tool-scale-24.svg | 147 +
.../scalable/gimp-tool-seamless-clone-24.svg | 225 +
icons/Symbolic/scalable/gimp-tool-shear-24.svg | 157 +
icons/Symbolic/scalable/gimp-tool-smudge-24.svg | 133 +
icons/Symbolic/scalable/gimp-tool-text-24.svg | 127 +
icons/Symbolic/scalable/gimp-tool-threshold-24.svg | 189 +
.../scalable/gimp-tool-unified-transform-24.svg | 150 +
icons/Symbolic/scalable/gimp-tool-warp-24.svg | 130 +
icons/Symbolic/scalable/gimp-tool-zoom-24.svg | 145 +
icons/Symbolic/symbolic-scalable-gtk3.svg |30196 --------------------
icons/Symbolic/symbolic-scalable.svg | 7261 ++++-
plug-ins/Makefile.am | 4 +-
plug-ins/screenshot/Makefile.am | 4 +-
plug-ins/screenshot/screenshot-gnome-shell.c | 39 +-
plug-ins/screenshot/screenshot-gnome-shell.h | 7 +-
plug-ins/screenshot/screenshot-osx.c | 21 +-
plug-ins/screenshot/screenshot-osx.h | 7 +-
plug-ins/screenshot/screenshot-win32.c | 63 +
plug-ins/screenshot/screenshot-win32.h | 36 +
plug-ins/screenshot/screenshot-x11.c | 9 +-
plug-ins/screenshot/screenshot-x11.h | 7 +-
plug-ins/screenshot/screenshot.c | 45 +-
plug-ins/screenshot/screenshot.h | 1 +
po-libgimp/oc.po | 1853 +-
po/es.po | 167 +-
262 files changed, 19041 insertions(+), 32526 deletions(-)
---
diff --cc plug-ins/Makefile.am
index 35683d4,c10daff..59d49f9
--- a/plug-ins/Makefile.am
+++ b/plug-ins/Makefile.am
@@@ -55,10 -53,9 +53,10 @@@ SUBDIRS =
imagemap \
lighting \
map-object \
+ metainfo \
pagecurl \
$(print) \
- $(screenshot) \
+ screenshot \
selection-to-path \
$(twain) \
ui \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
