[gimp/gimp-attributes-wip: 68/73] Merge remote-tracking branch 'remotes/origin/master' into gimp-attributes-wip
- From: Hartmut Kuhse <hartmutkuhse src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/gimp-attributes-wip: 68/73] Merge remote-tracking branch 'remotes/origin/master' into gimp-attributes-wip
- Date: Sat, 12 Nov 2016 13:02:59 +0000 (UTC)
commit dbdc5de66a5fa859dc14a4c9232c57448a926d9f
Merge: 7b43a1f 3bc2d25
Author: Hartmut Kuhse <hk_priv gmx de>
Date: Sat Nov 12 07:22:31 2016 +0100
Merge remote-tracking branch 'remotes/origin/master' into gimp-attributes-wip
app/actions/file-actions.c | 2 +-
app/actions/filters-actions.c | 8 +-
app/actions/image-commands.c | 36 +-
app/core/gimp-edit.c | 2 +-
app/core/gimp-user-install.c | 5 +-
app/core/gimp.c | 8 +-
app/core/gimpchannel.c | 25 +-
app/core/gimpdrawable-equalize.c | 13 +
app/core/gimpdrawable-fill.c | 19 +-
app/core/gimpdrawable-stroke.c | 23 +-
app/core/gimpdrawable-transform.c | 4 +
app/core/gimpdrawable.c | 31 +-
app/core/gimpdrawable.h | 8 +-
app/core/gimpdrawablefilter.c | 98 +
app/core/gimpdrawablefilter.h | 3 +
app/core/gimpdrawableundo.c | 2 +-
app/core/gimpdynamicsoutput.c | 8 +-
app/core/gimpgrouplayer.c | 20 +-
app/core/gimpimage-convert-indexed.c | 2 +-
app/core/gimpimage-convert-precision.c | 12 +-
app/core/gimpimage-convert-precision.h | 12 +-
app/core/gimpimage-convert-type.c | 3 +-
app/core/gimpitem.c | 12 +-
app/core/gimplayer.c | 24 +-
app/core/gimplayermask.c | 8 +-
app/core/gimpselection.c | 8 +-
app/core/gimptemplate.c | 39 +
app/dialogs/convert-precision-dialog.c | 254 +-
app/dialogs/convert-precision-dialog.h | 8 +
app/dialogs/grid-dialog.c | 3 +-
app/dialogs/layer-options-dialog.c | 2 +-
app/display/gimpcanvasitem.c | 162 +-
app/display/gimpcanvasitem.h | 7 +-
app/file/file-open.c | 28 +-
app/gegl/gimp-babl.c | 78 +
app/gegl/gimp-babl.h | 4 +-
app/gegl/gimp-gegl-apply-operation.c | 11 +-
app/gegl/gimp-gegl-apply-operation.h | 1 +
app/menus/filters-menu.c | 2 +-
app/operations/gimpoperationprofiletransform.c | 39 +-
app/operations/gimpoperationprofiletransform.h | 4 +-
app/paint/gimpsmudge.c | 18 +-
app/pdb/drawable-color-cmds.c | 4 +-
app/pdb/image-convert-cmds.c | 6 +-
app/sanity.c | 2 +-
app/text/gimptextlayer.c | 12 +-
app/text/gimptextundo.c | 3 +-
app/tools/gimpfilteroptions.c | 17 +
app/tools/gimpfilteroptions.h | 1 +
app/tools/gimpfiltertool.c | 43 +-
app/tools/gimpiscissorstool.c | 23 +-
app/widgets/gimpaction-history.c | 2 +-
app/widgets/gimpoverlaydialog.c | 2 +-
app/widgets/gimpprocedureaction.c | 2 +-
app/widgets/gimptemplateeditor.c | 114 +-
configure.ac | 4 +-
icons/Color/24/gimp-hchain-broken.png | Bin 872 -> 806 bytes
icons/Color/24/gimp-vchain-broken.png | Bin 991 -> 909 bytes
icons/Color/color-scalable.svg | 33 +-
icons/Color/scalable/gimp-hchain-broken.svg | 73 +-
icons/Color/scalable/gimp-vchain-broken.svg | 74 +-
libgimp/gimpexport.c | 2 +-
libgimpbase/gimpbaseenums.c | 2 +-
libgimpbase/gimpbaseenums.h | 2 +-
libgimpmath/gimpmath.def | 1 +
libgimpmath/gimpmatrix.c | 36 +
libgimpmath/gimpmatrix.h | 6 +
plug-ins/common/file-gif-save.c | 4 +-
plug-ins/file-ico/ico-load.c | 103 +-
plug-ins/file-jpeg/jpeg-save.c | 16 +-
plug-ins/file-jpeg/jpeg.c | 14 +-
plug-ins/file-psd/psd-save.c | 104 +-
plug-ins/file-tiff/file-tiff-save.c | 327 ++-
plug-ins/file-webp/file-webp-dialog.c | 241 ++-
plug-ins/file-webp/file-webp-save.c | 58 +-
plug-ins/file-webp/file-webp-save.h | 2 +
plug-ins/file-webp/file-webp.c | 80 +-
po-libgimp/hu.po | 310 ++-
po-libgimp/pl.po | 16 +-
po-libgimp/sv.po | 2115 ++++++++++-----
po-plug-ins/ca.po | 2 +-
po-plug-ins/pl.po | 737 +++---
po/ca.po | 2287 ++++++++++-------
po/de.po | 3341 ++++++++++++++----------
po/hu.po | 1445 +++++++----
po/it.po | 1660 +++++++-----
po/pl.po | 148 +-
tools/pdbgen/pdb/drawable_color.pdb | 4 +-
tools/pdbgen/pdb/image_convert.pdb | 6 +-
89 files changed, 9008 insertions(+), 5532 deletions(-)
---
diff --cc configure.ac
index c364435,e9bf40a..0d41366
--- a/configure.ac
+++ b/configure.ac
@@@ -63,10 -63,10 +63,10 @@@ m4_define([rsvg_required_version], [2.3
m4_define([wmf_required_version], [0.2.8])
m4_define([pygtk_required_version], [2.10.4])
m4_define([pycairo_required_version], [1.0.2])
- m4_define([poppler_required_version], [0.12.4])
+ m4_define([poppler_required_version], [0.44.0])
m4_define([poppler_data_required_version], [0.4.7])
m4_define([libgudev_required_version], [167])
-m4_define([gexiv2_required_version], [0.6.1])
+m4_define([gexiv2_required_version], [0.10.3])
m4_define([libmypaint_required_version], [1.3.0])
m4_define([lcms_required_version], [2.7])
m4_define([libpng_required_version], [1.6.25])
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]