[gimp/soc-2013-psd: 40/41] Merge branch 'master' into soc-2013-psd. Done to fix more stuff.

[Simon Lui <simonlui src gnome org>]

commit 344f1cd6fff65bf50b38fba6fb90a7a16a3905c7
Merge: 2a1e0e4 d38f209
Author: Simon Lui <simonlui src gnome org>
Date:   Thu Sep 12 01:00:00 2013 -0400

    Merge branch 'master' into soc-2013-psd. Done to fix more stuff.

 app/actions/filters-actions.c                      |   12 +
 app/actions/view-actions.c                         |    8 +-
 app/actions/windows-actions.c                      |   16 +
 app/config/gimpdisplayconfig.c                     |   80 +-
 app/config/gimpdisplayconfig.h                     |    4 -
 app/config/gimpdisplayoptions.c                    |   76 +
 app/config/gimpdisplayoptions.h                    |    8 +-
 app/config/gimprc-blurbs.h                         |   10 +-
 app/core/gimpdrawable.c                            |   14 +-
 app/core/gimpfilterstack.c                         |   71 +-
 app/core/gimppickable.c                            |   22 +-
 app/core/gimpprojection.c                          |   55 +
 app/dialogs/preferences-dialog.c                   |   61 +
 app/display/gimpdisplayshell-appearance.c          |   44 +-
 app/display/gimpdisplayshell-transform.c           |    2 +-
 app/display/gimpdisplayshell.c                     |   25 -
 app/display/gimpdisplayshell.h                     |    5 -
 app/display/gimpimagewindow.c                      |   34 +
 app/file/file-procedure.c                          |   22 +-
 app/menus/windows-menu.c                           |   36 +
 app/operations/gimpoperationborder.c               |  162 +-
 app/operations/gimpoperationgrow.c                 |   54 +-
 app/operations/gimpoperationshrink.c               |   67 +-
 app/sanity.c                                       |   14 +-
 app/tools/gimpgegltool.c                           |    2 +
 app/tools/gimpoperationtool.c                      |    6 +-
 app/widgets/gimpcontainerview.c                    |   22 +-
 build/windows/jhbuild/.gitignore                   |    2 +
 build/windows/jhbuild/README.md                    |   55 +
 build/windows/jhbuild/build                        |    6 +
 build/windows/jhbuild/build.jhbuildrc              |  244 +
 build/windows/jhbuild/checkversions.sh             |   14 +
 build/windows/jhbuild/clean                        |   10 +
 build/windows/jhbuild/compresslibs.moduleset       |   34 +
 build/windows/jhbuild/fake.mk                      |    3 +
 build/windows/jhbuild/gdb.moduleset                |   25 +
 build/windows/jhbuild/gimp.moduleset               |   81 +
 build/windows/jhbuild/glib.moduleset               |   48 +
 build/windows/jhbuild/gtk+.moduleset               |  189 +
 build/windows/jhbuild/imglibs.moduleset            |   85 +
 build/windows/jhbuild/misclibs.moduleset           |  119 +
 build/windows/jhbuild/mkarchive                    |   83 +
 .../jhbuild/patches/bzip2-1.0.5-slash.patch        |   11 +
 .../patches/bzip2-1.0.6-autoconfiscated.patch      |  287 +
 .../patches/fontconfig-fix-config-dir.patch        |   11 +
 ...ettext_0_18_crossbuild_override_tools_fix.patch |   11 +
 .../jhbuild/patches/ghostscript-8.71-windows.patch | 4535 +++++++++++++++
 .../patches/ghostscript-change-install-paths.patch |   24 +
 build/windows/jhbuild/patches/gtk2-uuid.patch      |   30 +
 .../jhbuild/patches/icu-fix-library-names.patch    |   21 +
 .../jhbuild/patches/icu-unexport-target.patch      |   11 +
 .../jhbuild/patches/jasper-1.900.1-mingw32.patch   |   22 +
 .../jhbuild/patches/jasper-1.900.1-sleep.patch     |   18 +
 .../jhbuild/patches/libjpeg-turbo-boolean.patch    |   11 +
 .../jhbuild/patches/libjpeg-turbo-int32.patch      |   17 +
 .../jhbuild/patches/libmng-1.0.10-mingw.patch      |   44 +
 .../libmng-1.0.9-dont-leak-zlib-streams.patch      |   14 +
 .../jhbuild/patches/libmng-change-locations.patch  |   19 +
 .../patches/libsoup-request-file-string-h.patch    |   13 +
 .../patches/libwmf/libwmf-0.2.8.3-nodocs.patch     |   29 +
 .../libwmf/libwmf-0.2.8.3-relocatablefonts.patch   |   36 +
 .../patches/libwmf/libwmf-0.2.8.4-deps.patch       |   27 +
 .../libwmf/libwmf-0.2.8.4-fallbackfont.patch       |   18 +
 .../libwmf/libwmf-0.2.8.4-intoverflow.patch        |   27 +
 .../patches/libwmf/libwmf-0.2.8.4-libpng-1.5.patch |   12 +
 .../libwmf/libwmf-0.2.8.4-multiarchdevel.patch     |  130 +
 .../libwmf/libwmf-0.2.8.4-reducesymbols.patch      |  520 ++
 .../libwmf/libwmf-0.2.8.4-useafterfree.patch       |   10 +
 .../jhbuild/patches/libxslt-1.1.26-w64.patch       |   24 +
 .../jhbuild/patches/pthreads-add-install-mk.patch  |    8 +
 .../jhbuild/patches/webkit-2.0-disable-tests.patch |   15 +
 .../jhbuild/patches/webkit-add-autogen.patch       |   31 +
 build/windows/jhbuild/split-build                  |   31 +
 build/windows/jhbuild/targetisunchanged            |   10 +
 build/windows/jhbuild/webkitgtk.moduleset          |   58 +
 build/windows/jhbuild/win32.cache                  |    6 +
 configure.ac                                       |    3 -
 desktop/Makefile.am                                |    3 +
 desktop/gimp.appdata.xml                           |   28 +
 devel-docs/app/app-docs.sgml                       |    1 -
 gimp.doap                                          |    9 +
 menus/image-menu.xml.in                            |    5 +-
 plug-ins/common/.gitignore                         |    4 +-
 plug-ins/common/Makefile.am                        |   13 +-
 plug-ins/common/animation-play.c                   |    6 +-
 plug-ins/common/bump-map.c                         |    8 +-
 plug-ins/common/file-png.c                         |   91 +-
 plug-ins/common/{file-raw.c => file-raw-data.c}    |  100 +-
 plug-ins/common/file-tiff-load.c                   |    6 +-
 plug-ins/common/file-tiff-save.c                   |    2 +-
 plug-ins/common/file-wmf.c                         |   45 +-
 plug-ins/common/file-xwd.c                         |  170 +-
 plug-ins/common/gimprc.common                      |    2 +-
 plug-ins/common/plugin-defs.pl                     |    6 +-
 po-libgimp/sl.po                                   |  362 +-
 po-plug-ins/POTFILES.in                            |    2 +-
 po-plug-ins/sl.po                                  | 3320 +++++-------
 po-python/sl.po                                    |   35 +-
 po/de.po                                           |   75 +-
 po/sl.po                                           | 5811 ++++++++++++--------
 tools/gimptool.c                                   |    3 +-
 101 files changed, 13136 insertions(+), 4995 deletions(-)
---