[gimp/gimp-attributes-wip: 647/714] Merge with master to be up to date



commit db63b49c1bd8cb2a41a4ec554e2b9e99a90802b4
Merge: 2aad13f d7d18c4
Author: Hartmut Kuhse <hk_priv gmx de>
Date:   Fri Feb 19 17:03:48 2016 +0100

    Merge with master to be up to date

 Makefile.am                                        |    2 +-
 app/core/gimpdrawable-combine.c                    |    2 +-
 app/core/gimpdrawable-filter.c                     |    7 +
 app/core/gimpdrawable.c                            |   19 +-
 app/core/gimpimage-merge.c                         |    2 +-
 app/core/gimpimagemap.c                            |  109 +-
 app/core/gimpimagemap.h                            |   49 +-
 app/gegl/gimpapplicator.c                          |  153 +-
 app/gegl/gimpapplicator.h                          |   14 +-
 app/paint/gimppaintcore.c                          |    3 +-
 configure.ac                                       |   24 +
 icons/Color/16/gimp-channel-indexed.png            |  Bin 973 -> 879 bytes
 icons/Color/16/gimp-flip-horizontal.png            |  Bin 674 -> 546 bytes
 icons/Color/16/gimp-flip-vertical.png              |  Bin 687 -> 608 bytes
 .../Color/16/gimp-gradient-shapeburst-angular.png  |  Bin 807 -> 796 bytes
 icons/Color/16/gimp-tool-blend.png                 |  Bin 851 -> 290 bytes
 icons/Color/16/gimp-tool-eraser.png                |  Bin 727 -> 408 bytes
 icons/Color/16/gimp-tool-perspective.png           |  Bin 811 -> 586 bytes
 icons/Color/16/gimp-tool-warp.png                  |  Bin 700 -> 771 bytes
 icons/Color/22/gimp-tool-blend.png                 |  Bin 1103 -> 449 bytes
 icons/Color/22/gimp-tool-eraser.png                |  Bin 994 -> 830 bytes
 icons/Color/22/gimp-tool-perspective.png           |  Bin 1236 -> 914 bytes
 icons/Color/22/gimp-tool-warp.png                  |  Bin 1016 -> 1192 bytes
 icons/Color/24/gimp-channel-indexed.png            |  Bin 1692 -> 1373 bytes
 icons/Color/32/gimp-channel-indexed.png            |  Bin 2611 -> 1914 bytes
 icons/Color/48/gimp-channel-indexed.png            |  Bin 4877 -> 3033 bytes
 icons/Color/Makefile.am                            |  519 +-
 icons/Color/color-scalable.svg                     | 1168 +-
 icons/Symbolic-Inverted/Makefile.am                |   68 +-
 icons/Symbolic/16/gimp-flip-horizontal.png         |  Bin 405 -> 566 bytes
 icons/Symbolic/16/gimp-flip-vertical.png           |  Bin 404 -> 596 bytes
 icons/Symbolic/16/gimp-tool-blend.png              |  Bin 690 -> 401 bytes
 icons/Symbolic/22/gimp-tool-blend.png              |  Bin 862 -> 806 bytes
 icons/Symbolic/Makefile.am                         |   40 +-
 icons/Symbolic/icon-list.mk                        |  485 -
 icons/Symbolic/scalable.svg                        | 1725 +--
 icons/icon-list.mk                                 |  780 +
 plug-ins/common/Makefile.am                        |    1 +
 plug-ins/common/file-cel.c                         |   10 +-
 plug-ins/common/file-gbr.c                         |   14 +-
 plug-ins/common/file-gif-save.c                    |   36 +-
 plug-ins/common/file-gih.c                         |   16 +-
 plug-ins/common/file-html-table.c                  |   12 +-
 plug-ins/common/file-pat.c                         |   14 +-
 plug-ins/common/file-pcx.c                         |   12 +-
 plug-ins/common/file-pix.c                         |   14 +-
 plug-ins/common/file-png.c                         |   44 +-
 plug-ins/common/file-pnm.c                         |   40 +-
 plug-ins/common/file-ps.c                          |   20 +-
 plug-ins/common/file-psp.c                         |   26 +-
 plug-ins/common/file-sunras.c                      |   18 +-
 plug-ins/common/file-tga.c                         |   12 +-
 plug-ins/common/file-xbm.c                         |   18 +-
 plug-ins/common/file-xmc.c                         |   20 +-
 plug-ins/common/file-xpm.c                         |   12 +-
 plug-ins/common/file-xwd.c                         |   18 +-
 plug-ins/common/plugin-defs.pl                     |    2 +-
 plug-ins/common/tile.c                             |  282 +-
 plug-ins/file-bmp/bmp-write.c                      |    6 +-
 plug-ins/file-fits/fits.c                          |   16 +-
 plug-ins/file-fli/fli-gimp.c                       |   14 +-
 plug-ins/file-ico/ico-save.c                       |    4 +-
 plug-ins/file-jpeg/jpeg-save.c                     |    4 +-
 plug-ins/file-psd/psd-save.c                       |   24 +-
 plug-ins/file-sgi/sgi.c                            |   18 +-
 plug-ins/file-tiff/file-tiff-save.c                |    6 +-
 po-libgimp/lv.po                                   | 1614 ++-
 po-plug-ins/lv.po                                  | 8683 ++++++------
 po-plug-ins/pl.po                                  |  252 +-
 po-python/lv.po                                    |  249 +-
 po-script-fu/lv.po                                 | 1069 +-
 po/lv.po                                           |16069 ++++++++++++++------
 po/pl.po                                           | 1583 ++-
 themes/The-Dark-Side-of-Gimp/gtkrc                 |   48 +-
 .../ui/gimp-button-prelight.png                    |  Bin 4126 -> 4154 bytes
 themes/The-Light-Side-of-Gimp/gtkrc                |   87 +-
 .../ui/entry-border-fill-active-item.png           |  Bin 0 -> 125 bytes
 .../ui/gimp-arrow-right-prelight.png               |  Bin 0 -> 179 bytes
 .../ui/gimp-button-prelight.png                    |  Bin 4513 -> 4605 bytes
 themes/The-Light-Side-of-Gimp/ui/menuitem.png      |  Bin 211 -> 3617 bytes
 themes/The-Light-Side-of-Gimp/ui/spin-fill-bg.png  |  Bin 0 -> 3397 bytes
 tools/Makefile.am                                  |   24 +-
 tools/compute-svg-viewbox.c                        |   85 +
 tools/extract-vector-icon.sh                       |  117 +
 tools/invert-svg.c                                 |  107 +
 85 files changed, 21372 insertions(+), 14517 deletions(-)
---


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]