From a1b2e7c1c2fc308b76015e8b8ecb5eab233119cf Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Mon, 17 Aug 2015 22:09:03 -0400
Subject: [PATCH] 3.17.7

---
 NEWS         | 16 ++++++++++++++++
 configure.ac |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index 30f695ba49..576341a394 100644
--- a/NEWS
+++ b/NEWS
@@ -11,6 +11,16 @@ Overview of Changes in GTK+ 3.17.7
 * GtkColorChooser:
  - Make it possible to start with the editor
 
+* GtkTextView:
+ - Support top margins
+ - Use CSS padding from the theme
+
+* GtkFlowBox:
+ - Allow using a GListModel
+
+* GtkCellRendererText:
+ - Support alpha in foreground color
+
 * Theme and CSS:
  - HighContrast theme improvements
 
@@ -31,12 +41,18 @@ Overview of Changes in GTK+ 3.17.7
  753391 [HighContrast] GtkPlacesSidebar:backdrop is white-covered on t...
  753392 listbox: Avoid using show_all on rows
  753451 GtkLinkButton's context menu has underlined labels
+ 753568 popover: Optimize the transition
+ 753621 wayland: calculate screen physical size
+ 406159 gtk text view widget doesn't have set_top_margin function
+ 746435 wayland: Use g_get_prgname() to get the xdg_surface.set_app_id string
 
 * Translation updates:
  Catalan
+ Galician
  Lithuanian
  Norwegian bokmål
  Portuguese
+ Slovak
  Spanish
  Turkish
 
diff --git a/configure.ac b/configure.ac
index 1ab797ac92..06386d24cd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10,7 +10,7 @@
 
 m4_define([gtk_major_version], [3])
 m4_define([gtk_minor_version], [17])
-m4_define([gtk_micro_version], [6])
+m4_define([gtk_micro_version], [7])
 m4_define([gtk_interface_age], [0])
 m4_define([gtk_binary_age],
           [m4_eval(100 * gtk_minor_version + gtk_micro_version)])