[gimp: 5/6] Merge branch 'master' into bug-728633
- From: Michael Schumacher <schumaml src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp: 5/6] Merge branch 'master' into bug-728633
- Date: Fri, 30 Dec 2016 20:46:25 +0000 (UTC)
commit 779649bdb7a5393bc2604ecd823f0b0efefd17cb
Merge: b6e7d19 c9520ba
Author: Michael Schumacher <schumaml gmx de>
Date: Fri Dec 30 21:14:44 2016 +0100
Merge branch 'master' into bug-728633
app/actions/drawable-actions.c | 12 ++-
app/actions/drawable-commands.c | 20 +++-
app/actions/drawable-commands.h | 2 +
app/gui/gui.c | 23 ++++
libgimpwidgets/gimpcolorscales.c | 16 ++--
libgimpwidgets/gimpenumstore.c | 9 +-
menus/image-menu.xml.in | 1 +
plug-ins/common/metadata.c | 219 +++++++++++++++++++++++++++--------
tools/pdbgen/pdb/gradient.pdb | 6 +-
tools/pdbgen/pdb/plug_in_compat.pdb | 2 +-
10 files changed, 242 insertions(+), 68 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]