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



commit abf78ef364b649c1f38a4c5f5a59f99b90c0ab83
Merge: a652f63 aa4f4d6
Author: Hartmut Kuhse <hk_priv gmx de>
Date:   Wed Nov 2 18:06:32 2016 +0100

    Merge remote-tracking branch 'remotes/origin/master' into gimp-attributes-wip

 NEWS                                    |  101 +
 app/operations/gimpoperationthreshold.c |   56 +-
 app/operations/gimpoperationthreshold.h |    1 +
 app/pdb/color-cmds.c                    |   24 +-
 app/pdb/drawable-color-cmds.c           |   87 +-
 app/tools/gimpthresholdtool.c           |  162 +-
 app/tools/gimpthresholdtool.h           |    1 +
 configure.ac                            |   14 +-
 libgimp/gimpcolor_pdb.c                 |   26 +-
 libgimp/gimpcolor_pdb.h                 |    2 +
 libgimp/gimpdrawablecolor_pdb.c         |   39 +-
 libgimp/gimpdrawablecolor_pdb.h         |    9 +-
 plug-ins/common/file-png.c              |    6 +
 po-libgimp/ca.po                        |    2 +-
 po-libgimp/de.po                        |  531 ++--
 po-plug-ins/sv.po                       | 5217 ++++++++++++++++---------------
 tools/pdbgen/pdb/color.pdb              |    5 +-
 tools/pdbgen/pdb/drawable_color.pdb     |   53 +-
 18 files changed, 3334 insertions(+), 3002 deletions(-)
---
diff --cc configure.ac
index 125e9b1,f577ce1..c364435
--- a/configure.ac
+++ b/configure.ac
@@@ -66,10 -66,10 +66,10 @@@ m4_define([pycairo_required_version], [
  m4_define([poppler_required_version], [0.12.4])
  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.2.37])
+ m4_define([libpng_required_version], [1.6.25])
  m4_define([liblzma_required_version], [5.0.0])
  m4_define([openexr_required_version], [1.6.1])
  m4_define([gtk_mac_integration_required_version], [2.0.0])


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