[gimp/gimp-attributes-wip: 36/37] Merge remote-tracking branch 'remotes/origin/master' into gimp-attributes-wip

[Hartmut Kuhse <hartmutkuhse src gnome org>]

commit ac9e872576dd33ed9e1a99933e7addf21ea95e9a
Merge: db980ff 6f4fb84
Author: Hartmut Kuhse <hk_priv gmx de>
Date:   Fri Nov 14 09:51:54 2014 +0100

    Merge remote-tracking branch 'remotes/origin/master' into gimp-attributes-wip
    
    Conflicts:
        app/pdb/internal-procs.c
        plug-ins/common/Makefile.am
        plug-ins/common/gimprc.common

 app/actions/filters-actions.c                      |   12 +
 app/core/gimp-utils.c                              |    6 +-
 app/display/gimpimagewindow.c                      |   24 +
 app/gegl/gimp-gegl-loops.c                         |    2 +-
 app/operations/Makefile.am                         |    2 +
 app/operations/gimp-operations.c                   |    2 +
 app/operations/gimpoperationscalarmultiply.c       |  189 +
 app/operations/gimpoperationscalarmultiply.h       |   56 +
 app/paint/gimpbrushcore.c                          |    4 +-
 app/paint/gimppaintoptions.c                       |   34 +
 app/paint/gimppaintoptions.h                       |   10 +-
 app/pdb/context-cmds.c                             |  160 +
 app/pdb/internal-procs.c                           |    2 +-
 app/pdb/plug-in-compat-cmds.c                      |  164 +
 app/sanity.c                                       |    2 +
 app/tests/gimp-app-test-utils.c                    |   11 +-
 app/tools/gimpgegltool.c                           |    2 +
 app/tools/gimppaintoptions-gui.c                   |   57 +-
 app/tools/gimpwarpoptions.c                        |   51 +-
 app/tools/gimpwarpoptions.h                        |   15 +-
 app/tools/gimpwarptool.c                           |  185 +-
 app/widgets/gimpdatafactoryview.c                  |  120 +-
 autogen.sh                                         |   42 +-
 build/windows/jhbuild/build.jhbuildrc              |    5 +-
 build/windows/jhbuild/gtk+.moduleset               |    8 +-
 .../jhbuild/patches/cairo-disable-lto.patch        |   51 -
 devel-docs/Jenkins-Tutorial.odt                    |  Bin 0 -> 1047921 bytes
 libgimp/gimpcontext_pdb.c                          |   93 +
 libgimp/gimpcontext_pdb.h                          |    3 +
 libgimpconfig/gimpconfig-path.c                    |    2 +-
 menus/image-menu.xml.in                            |    2 +
 plug-ins/common/.gitignore                         |    4 -
 plug-ins/common/Makefile.am                        |   18 -
 plug-ins/common/color-exchange.c                   |  783 --
 plug-ins/common/file-cel.c                         |   77 +-
 plug-ins/common/file-gbr.c                         |   74 +-
 plug-ins/common/file-gih.c                         |  290 +-
 plug-ins/common/file-pat.c                         |   52 +-
 plug-ins/common/file-ps.c                          | 1529 +++--
 plug-ins/common/gimprc.common                      |    1 -
 plug-ins/common/iwarp.c                            | 1803 ----
 plug-ins/common/plugin-defs.pl                     |    2 -
 plug-ins/file-jpeg/jpeg-load.c                     |    4 +
 plug-ins/file-jpeg/jpeg-save.c                     |    4 +
 plug-ins/gfig/gfig.c                               |    4 +
 plug-ins/pygimp/gimpenumsmodule.c                  |   14 +-
 plug-ins/pygimp/plug-ins/foggify.py                |    4 +-
 plug-ins/script-fu/tinyscheme/scheme.c             |    5 +
 po-plug-ins/POTFILES.in                            |    2 -
 po-tips/fi.po                                      |    2 +-
 po/fi.po                                           |    2 +-
 po/it.po                                           | 1150 ++--
 po/uk.po                                           | 9072 ++++++++++++--------
 tools/pdbgen/pdb/context.pdb                       |   97 +
 tools/pdbgen/pdb/plug_in_compat.pdb                |   83 +
 tools/pdbgen/stddefs.pdb                           |    4 +
 56 files changed, 8670 insertions(+), 7726 deletions(-)
---