Merge branch 'master' into native-layoutnative-layout

Conflicts:
	gtk/gtkplug.c
	gtk/gtkscrolledwindow.c

1 files changed, 6 insertions, 6 deletions

diff --git a/gtk/gtktable.h b/gtk/gtktable.h
index f71b3e7d4f..b2f807ad90 100644
--- a/gtk/gtktable.h
+++ b/gtk/gtktable.h
@@ -45,18 +45,18 @@ G_BEGIN_DECLS
 #define GTK_TABLE_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_TABLE, GtkTableClass))
 
 
-typedef struct _GtkTable	GtkTable;
-typedef struct _GtkTablePriv    GtkTablePriv;
-typedef struct _GtkTableClass	GtkTableClass;
-typedef struct _GtkTableChild	GtkTableChild;
-typedef struct _GtkTableRowCol	GtkTableRowCol;
+typedef struct _GtkTable              GtkTable;
+typedef struct _GtkTablePrivate       GtkTablePrivate;
+typedef struct _GtkTableClass         GtkTableClass;
+typedef struct _GtkTableChild         GtkTableChild;
+typedef struct _GtkTableRowCol        GtkTableRowCol;
 
 struct _GtkTable
 {
   GtkContainer container;
 
   /* <private> */
-  GtkTablePriv *priv;
+  GtkTablePrivate *priv;
 };
 
 struct _GtkTableClass