[gimp/meson: 110/112] Merge branch 'master' into meson
- From: Félix Piédallu <fpiedallu src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/meson: 110/112] Merge branch 'master' into meson
- Date: Fri, 20 Apr 2018 14:42:46 +0000 (UTC)
commit a21efe50f441794aad7bc77e7f90ba4f011eae0c
Merge: 11af20f e4f327e
Author: Salamandar <felix piedallu me>
Date: Fri Apr 20 15:52:03 2018 +0200
Merge branch 'master' into meson
INSTALL.in | 24 +-
NEWS | 27 +-
app/actions/edit-commands.c | 5 +-
app/actions/gradient-editor-commands.c | 2 +
app/core/Makefile.am | 8 +-
app/core/gimp-edit.c | 119 -
app/core/gimp-edit.h | 11 -
app/core/gimp-user-install.c | 58 +-
app/core/gimpdrawable-blend.h | 49 -
app/core/gimpdrawable-edit.c | 94 +
app/core/gimpdrawable-edit.h | 29 +
...impdrawable-blend.c => gimpdrawable-gradient.c} | 97 +-
app/core/gimpdrawable-gradient.h | 50 +
app/core/gimpdrawable-transform.c | 118 +-
app/core/gimpgradient.c | 161 +-
app/core/gimpgradient.h | 6 +
app/core/gimpimage-fade.c | 78 +
app/core/gimpimage-fade.h | 26 +
app/core/gimppalette-import.c | 14 +-
app/core/gimppalette-import.h | 1 +
app/core/gimpparamspecs-duplicate.c | 9 +
app/core/gimpselection.c | 4 +-
app/core/gimptoolpreset.c | 4 +-
app/dialogs/dialogs.c | 2 +-
app/dialogs/fade-dialog.c | 4 +-
app/dialogs/palette-import-dialog.c | 1 +
app/display/gimpcanvas-style.c | 4 +-
app/display/gimpcanvassamplepoint.c | 13 +-
app/display/gimpdisplayshell-dnd.c | 3 +-
app/display/gimpdisplayshell-tool-events.c | 54 +-
app/display/gimpdisplayshell.h | 6 +
app/gui/splash.c | 37 +-
app/operations/Makefile.am | 4 +-
app/operations/gimp-operations.c | 4 +-
app/operations/gimpoperationblend.h | 68 -
...impoperationblend.c => gimpoperationgradient.c} | 290 +-
app/operations/gimpoperationgradient.h | 74 +
app/paint/gimpairbrush.c | 38 +-
app/paint/gimpairbrush.h | 5 +
app/paint/gimppaintcore-loops.cc | 1494 ++-
app/paint/gimppaintcore-loops.h | 116 +-
app/paint/gimppaintcore.c | 75 +-
app/paint/gimppaintoptions.c | 59 +-
app/paint/gimppaintoptions.h | 17 +-
app/paint/gimpsourcecore.c | 2 -
app/pdb/Makefile.am | 1 +
app/pdb/context-cmds.c | 690 +-
app/pdb/drawable-edit-cmds.c | 620 +
app/pdb/edit-cmds.c | 101 +-
app/pdb/gimppdbcontext.c | 8 +
app/pdb/gimppdbcontext.h | 2 +
app/pdb/gradient-cmds.c | 54 +-
app/pdb/gradients-cmds.c | 12 +-
app/pdb/image-select-cmds.c | 9 +
app/pdb/internal-procs.c | 3 +-
app/pdb/internal-procs.h | 1 +
app/pdb/item-transform-cmds.c | 29 +-
app/pdb/plug-in-compat-cmds.c | 12 +-
app/pdb/text-layer-cmds.c | 4 +-
app/plug-in/gimppluginprocframe.c | 2 +-
app/sanity.c | 2 +-
app/tools/Makefile.am | 12 +-
app/tools/gimp-tools.c | 4 +-
app/tools/gimpairbrushtool.c | 50 +-
app/tools/gimpblendtool-editor.c | 2515 ---
app/tools/gimpblendtool-editor.h | 48 -
app/tools/gimpblendtool.c | 1072 -
app/tools/gimpbrushtool.c | 139 +-
app/tools/gimpbrushtool.h | 11 +-
app/tools/gimpbucketfilltool.c | 4 +-
app/tools/gimpcroptool.c | 2 -
app/tools/gimpeditselectiontool.c | 104 +-
.../{gimpblendoptions.c => gimpgradientoptions.c} | 119 +-
.../{gimpblendoptions.h => gimpgradientoptions.h} | 30 +-
app/tools/gimpgradienttool-editor.c | 2517 +++
app/tools/gimpgradienttool-editor.h | 48 +
app/tools/gimpgradienttool.c | 1096 +
app/tools/{gimpblendtool.h => gimpgradienttool.h} | 38 +-
app/tools/gimpmovetool.c | 129 +-
app/tools/gimppaintoptions-gui.c | 16 +-
app/tools/gimppainttool-paint.c | 242 +-
app/tools/gimppainttool-paint.h | 37 +-
app/tools/gimppainttool.c | 28 +-
app/tools/gimppainttool.h | 56 +-
app/tools/gimprectangleselecttool.c | 2 -
app/tools/gimptransformoptions.c | 8 +
app/tools/gimptransformtool.c | 16 +-
app/tools/tool_manager.c | 4 +-
app/widgets/gimpcursor.c | 2 +-
app/widgets/gimpcurveview.c | 2 +-
app/widgets/gimpdrawabletreeview.c | 16 +-
app/widgets/gimpgradienteditor.c | 8 +-
app/widgets/gimpgradienteditor.h | 2 +
app/widgets/gimpgradientselect.c | 4 +-
app/widgets/gimphelp-ids.h | 2 +-
app/widgets/gimphistogramview.c | 4 +-
app/widgets/gimpsamplepointeditor.c | 188 +-
app/widgets/gimpsamplepointeditor.h | 7 +-
app/widgets/gimpviewablebox.c | 64 +-
app/widgets/gimpviewablebox.h | 4 +-
app/widgets/gimpviewrenderergradient.c | 25 +-
app/widgets/gimpviewrenderergradient.h | 24 +-
app/widgets/widgets-enums.h | 2 +-
build/flatpak/flatpak-howto.txt | 2 +-
build/flatpak/org.gimp.GIMP-dev.json | 12 +-
build/windows/installer/associations.isi | 2 +-
build/windows/installer/configoverride.isi | 2 +-
build/windows/installer/gimp3264.iss | 5 +-
build/windows/installer/lang/Makefile.am | 3 +-
build/windows/jhbuild/build.jhbuildrc | 4 +-
.../jhbuild/patches/ghostscript-8.71-windows.patch | 2 +-
configure.ac | 10 +-
cursors/Makefile.am | 2 +-
cursors/gimp-tool-cursors.xcf | Bin 78346 -> 78349 bytes
cursors/{tool-blend.png => tool-gradient.png} | Bin 634 -> 634 bytes
data/brushes/gimp-obsolete-files/Makefile.am | 3 +
data/brushes/gimp-obsolete-files/dunes.gbr | Bin 0 -> 1100 bytes
data/brushes/gimp-obsolete-files/galaxy-big.gbr | Bin 0 -> 10040 bytes
data/brushes/gimp-obsolete-files/galaxy.gbr | Bin 0 -> 2637 bytes
data/images/gimp-splash.png | Bin 129666 -> 507529 bytes
data/images/gimp-splash.xcf | Bin 13439283 -> 13464022 bytes
data/tool-presets/FX/FX-Radial-Softlight.gtp | 6 +-
data/tool-presets/FX/Vignette.gtp | 6 +-
devel-docs/GIMP3-API-Changes.txt | 9 +-
devel-docs/debugging-tips.txt | 2 +-
devel-docs/gih.txt | 2 +-
devel-docs/libgimp/libgimp-docs.sgml | 1 +
devel-docs/libgimp/libgimp-sections.txt | 29 +
devel-docs/libgimpbase/libgimpbase-sections.txt | 11 +
.../libgimpwidgets/libgimpwidgets-sections.txt | 2 +-
devel-docs/parasites.txt | 2 +-
devel-docs/release-howto.txt | 10 +-
devel-docs/structure.xml | 2 +-
devel-docs/tools/shooter.c | 2 +-
devel-docs/ui-framework.txt | 2 +-
docs/gimprc.5.in | 6 +
etc/gimprc.in | 5 +
...{gimp-tool-blend.png => gimp-tool-gradient.png} | Bin 990 -> 990 bytes
...{gimp-tool-blend.png => gimp-tool-gradient.png} | Bin 1582 -> 1582 bytes
...{gimp-tool-blend.svg => gimp-tool-gradient.svg} | 2 +-
icons/Color/color-scalable.svg | 4 +-
...{gimp-tool-blend.svg => gimp-tool-gradient.svg} | 2 +-
...{gimp-tool-blend.png => gimp-tool-gradient.png} | Bin 290 -> 290 bytes
...{gimp-tool-blend.png => gimp-tool-gradient.png} | Bin 449 -> 449 bytes
icons/Legacy/Makefile.am | 4 +-
...{gimp-tool-blend.png => gimp-tool-gradient.png} | Bin 400 -> 400 bytes
...{gimp-tool-blend.png => gimp-tool-gradient.png} | Bin 507 -> 507 bytes
...{gimp-tool-blend.svg => gimp-tool-gradient.svg} | 4 +-
...{gimp-tool-blend.svg => gimp-tool-gradient.svg} | 4 +-
icons/Symbolic/symbolic-scalable.svg | 6 +-
icons/icon-list.mk | 8 +-
libgimp/Makefile.am | 2 +
libgimp/gimp.def | 16 +
libgimp/gimp_pdb_headers.h | 1 +
libgimp/gimpcontext_pdb.c | 516 +-
libgimp/gimpcontext_pdb.h | 230 +-
libgimp/gimpdrawableedit_pdb.c | 320 +
libgimp/gimpdrawableedit_pdb.h | 60 +
libgimp/gimpedit_pdb.c | 14 +
libgimp/gimpedit_pdb.h | 7 +
libgimp/gimpenums.c.tail | 2 +
libgimp/gimpexport.c | 2 +-
libgimp/gimpimageselect_pdb.c | 9 +
libgimp/gimptextlayer_pdb.c | 6 +
libgimpbase/gimpbase.def | 1 +
libgimpbase/gimpbaseenums.c | 32 +
libgimpbase/gimpbaseenums.h | 13 +
libgimpbase/gimpdatafiles.h | 2 +-
libgimpbase/gimpsignal.c | 2 +-
libgimpbase/gimpwin32-io.h | 2 +-
libgimpcolor/gimpcolorprofile.c | 10 +-
libgimpcolor/gimpcolortransform.c | 14 +-
libgimpthumb/gimpthumbnail.c | 2 +-
libgimpwidgets/Makefile.am | 2 +-
libgimpwidgets/gimpcolorselector.c | 2 +-
libgimpwidgets/gimpeevl.c | 8 +-
libgimpwidgets/gimpenumstore.c | 2 +-
libgimpwidgets/gimpicons.c | 2 +
libgimpwidgets/gimpicons.h | 6 +-
libgimpwidgets/gimppreview.c | 2 +-
libgimpwidgets/gimppropwidgets.c | 2 +-
menus/image-menu.xml.in | 2 +-
pdb/Makefile.am | 1 +
pdb/app.pl | 24 +-
pdb/enums.pl | 10 +
pdb/groups.pl | 1 +
pdb/groups/context.pdb | 428 +-
pdb/groups/drawable_edit.pdb | 448 +
pdb/groups/edit.pdb | 73 +-
pdb/groups/gradient.pdb | 54 +-
pdb/groups/gradients.pdb | 12 +-
pdb/groups/image_select.pdb | 9 +
pdb/groups/item_transform.pdb | 19 +-
pdb/groups/plug_in_compat.pdb | 12 +-
pdb/lib.pl | 24 +-
pdb/pdbgen.pl | 2 +-
pdb/stddefs.pdb | 4 +-
plug-ins/common/blinds.c | 4 +-
plug-ins/common/cartoon.c | 2 +-
plug-ins/common/cml-explorer.c | 2 +-
plug-ins/common/compose.c | 2 +-
plug-ins/common/contrast-retinex.c | 2 +-
plug-ins/common/curve-bend.c | 18 +-
plug-ins/common/decompose.c | 6 +-
plug-ins/common/despeckle.c | 6 +-
plug-ins/common/file-cel.c | 2 +-
plug-ins/common/file-dicom.c | 2 +-
plug-ins/common/file-jp2-load.c | 2 +-
plug-ins/common/file-pdf-save.c | 2 +-
plug-ins/common/file-pnm.c | 4 +-
plug-ins/common/file-ps.c | 8 +-
plug-ins/common/file-raw-data.c | 2 +-
plug-ins/common/film.c | 6 +-
plug-ins/common/max-rgb.c | 2 +-
plug-ins/common/photocopy.c | 2 +-
plug-ins/common/sample-colorize.c | 10 +-
plug-ins/common/softglow.c | 2 +-
plug-ins/common/sphere-designer.c | 2 +-
plug-ins/common/tile-small.c | 2 +-
plug-ins/common/unsharp-mask.c | 6 +-
plug-ins/file-fits/fits-io.c | 6 +-
plug-ins/file-fits/fits.c | 2 +-
plug-ins/file-psd/psd-util.c | 2 +-
plug-ins/file-tiff/file-tiff-load.c | 2 +-
plug-ins/file-tiff/file-tiff-save.c | 2 +-
plug-ins/file-webp/file-webp-save.c | 2 +-
plug-ins/flame/libifs.c | 2 +-
plug-ins/gfig/gfig-dialog.c | 96 +-
plug-ins/gfig/gfig-style.c | 2 +-
plug-ins/gradient-flare/gradient-flare.c | 6 +-
plug-ins/ifs-compose/ifs-compose-utils.c | 2 +-
plug-ins/metadata/metadata-editor.c | 22 +-
plug-ins/metadata/metadata-viewer.c | 2 +-
plug-ins/print/print-settings.c | 2 +-
plug-ins/pygimp/ChangeLog.old | 2 +-
plug-ins/pygimp/doc/gimp-module-procedures.html | 2 +-
plug-ins/pygimp/doc/gimp-objects.html | 2 +-
plug-ins/pygimp/doc/procedural-database.html | 2 +-
plug-ins/pygimp/doc/pygimp.html | 6 +-
plug-ins/pygimp/doc/pygimp.sgml | 8 +-
plug-ins/pygimp/plug-ins/palette-sort.py | 2 +-
plug-ins/screenshot/screenshot-x11.c | 2 +-
plug-ins/script-fu/ftx/README | 2 +-
plug-ins/script-fu/ftx/ftx-functions.txt | 2 +-
plug-ins/script-fu/scripts/add-bevel.scm | 8 +-
plug-ins/script-fu/scripts/addborder.scm | 10 +-
plug-ins/script-fu/scripts/burn-in-anim.scm | 61 +-
plug-ins/script-fu/scripts/carve-it.scm | 14 +-
plug-ins/script-fu/scripts/chrome-it.scm | 20 +-
plug-ins/script-fu/scripts/circuit.scm | 4 +-
plug-ins/script-fu/scripts/clothify.scm | 3 +-
plug-ins/script-fu/scripts/coffee.scm | 21 +-
plug-ins/script-fu/scripts/distress-selection.scm | 4 +-
plug-ins/script-fu/scripts/drop-shadow.scm | 6 +-
plug-ins/script-fu/scripts/erase-rows.scm | 6 +-
plug-ins/script-fu/scripts/font-map.scm | 4 +-
plug-ins/script-fu/scripts/fuzzyborder.scm | 10 +-
plug-ins/script-fu/scripts/gradient-example.scm | 14 +-
plug-ins/script-fu/scripts/grid-system.scm | 2 +-
plug-ins/script-fu/scripts/lava.scm | 2 +-
plug-ins/script-fu/scripts/line-nova.scm | 2 +-
plug-ins/script-fu/scripts/mkbrush.scm | 10 +-
plug-ins/script-fu/scripts/old-photo.scm | 2 +-
plug-ins/script-fu/scripts/palette-export.scm | 2 +-
plug-ins/script-fu/scripts/perspective-shadow.scm | 4 +-
plug-ins/script-fu/scripts/predator.scm | 2 +-
plug-ins/script-fu/scripts/ripply-anim.scm | 4 +-
plug-ins/script-fu/scripts/round-corners.scm | 2 +-
plug-ins/script-fu/scripts/script-fu-compat.init | 2 +-
plug-ins/script-fu/scripts/slide.scm | 4 +-
plug-ins/script-fu/scripts/test-sphere.scm | 29 +-
plug-ins/script-fu/scripts/weave.scm | 31 +-
plug-ins/script-fu/scripts/xach-effect.scm | 14 +-
plug-ins/script-fu/tinyscheme/CHANGES | 4 +-
plug-ins/script-fu/tinyscheme/Manual.txt | 2 +-
plug-ins/script-fu/tinyscheme/hack.txt | 4 +-
plug-ins/script-fu/tinyscheme/scheme.c | 2 +-
plug-ins/selection-to-path/README | 4 +-
plug-ins/selection-to-path/bitmap.h | 2 +-
po-libgimp/da.po | 397 +-
po-libgimp/it.po | 294 +-
po-libgimp/pl.po | 273 +-
po-libgimp/ru.po | 502 +-
po-libgimp/sv.po | 1079 +-
po-plug-ins/da.po | 326 +-
po-plug-ins/it.po | 24 +-
po-plug-ins/sv.po | 60 +-
po-script-fu/sv.po | 10 +-
po-tips/da.po | 20 +-
po-windows-installer/LINGUAS | 1 +
po-windows-installer/zh_CN.po | 368 +
po/POTFILES.in | 11 +-
po/da.po | 3088 ++--
po/it.po | 2381 ++-
po/pl.po | 691 +-
po/ru.po | 817 +-
po/sv.po |18794 ++++++++++-------
po/zh_CN.po |22193 ++++++++++++++------
themes/Dark/gtkrc | 10 +-
tools/Makefile.am | 2 +-
tools/gimp-mkenums | 2 +-
301 files changed, 43606 insertions(+), 24533 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
