[gimp/gimp-attributes-wip: 38/102] Merge to stay up-to-date



commit b557263a81d65fc5cc876fc31f0405137612a2b4
Merge: 2d3a056 21d9841
Author: Hartmut Kuhse <hk_priv gmx de>
Date:   Sun Mar 20 11:23:06 2016 +0100

    Merge to stay up-to-date

 app/gegl/gimp-gegl-config.c                   |    4 +-
 app/operations/gimpoperationflood.c           | 1441 ++++++-
 app/operations/tests/data/flood-input.png     |  Bin 0 -> 14282 bytes
 app/operations/tests/data/flood-output.png    |  Bin 0 -> 11632 bytes
 app/sanity.c                                  |    2 +-
 app/tools/gimpgegltool.c                      |   40 +-
 app/tools/gimpimagemaptool.c                  |   27 +-
 app/tools/gimpimagemaptool.h                  |    2 -
 app/tools/gimpoperationtool.c                 |    6 -
 build/windows/installer/lang/pt_BR.setup.isl  |    4 +-
 configure.ac                                  |    4 +-
 icons/Symbolic/22/gimp-letter-spacing.png     |  Bin 811 -> 805 bytes
 icons/Symbolic/22/gimp-line-spacing.png       |  Bin 575 -> 523 bytes
 icons/Symbolic/24/gimp-gravity-east.png       |  Bin 410 -> 492 bytes
 icons/Symbolic/24/gimp-gravity-north-east.png |  Bin 436 -> 614 bytes
 icons/Symbolic/24/gimp-gravity-north-west.png |  Bin 422 -> 590 bytes
 icons/Symbolic/24/gimp-gravity-north.png      |  Bin 421 -> 495 bytes
 icons/Symbolic/24/gimp-gravity-south-east.png |  Bin 460 -> 621 bytes
 icons/Symbolic/24/gimp-gravity-south-west.png |  Bin 440 -> 598 bytes
 icons/Symbolic/24/gimp-gravity-south.png      |  Bin 420 -> 492 bytes
 icons/Symbolic/24/gimp-gravity-west.png       |  Bin 433 -> 516 bytes
 icons/Symbolic/24/gimp-hcenter.png            |  Bin 469 -> 607 bytes
 icons/Symbolic/24/gimp-hfill.png              |  Bin 658 -> 615 bytes
 icons/Symbolic/24/gimp-vcenter.png            |  Bin 451 -> 611 bytes
 icons/Symbolic/24/gimp-vfill.png              |  Bin 655 -> 565 bytes
 icons/Symbolic/scalable.svg                   | 1277 +++----
 plug-ins/common/file-ps.c                     |    4 +-
 plug-ins/common/newsprint.c                   |    2 +-
 po/de.po                                      | 5380 +++++++++++--------------
 29 files changed, 4333 insertions(+), 3860 deletions(-)
---


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