[gtk+/client-side-decorations: 11/11] Merge branch 'master' into client-side-decorations

[Cody Russell <bratsche src gnome org>]

commit 812266a267d0aee58777cf918627ffe5d3233b02
Merge: 02edc3c... 6ca5430...
Author: Cody Russell <bratsche gnome org>
Date:   Fri Jul 10 03:24:15 2009 +0100

    Merge branch 'master' into client-side-decorations

 docs/reference/gtk/gtk-sections.txt |    2 +
 gdk/directfb/gdkdisplay-directfb.c  |   18 +-
 gdk/directfb/gdkgc-directfb.c       |   14 +-
 gdk/directfb/gdkinput-directfb.h    |    1 -
 gdk/directfb/gdkmain-directfb.c     |   81 +-----
 gdk/directfb/gdkpixmap-directfb.c   |   30 +-
 gdk/directfb/gdkwindow-directfb.c   |  537 ++++++-----------------------------
 gdk/gdkdisplay.c                    |   56 ++--
 gdk/gdkinternals.h                  |   19 +-
 gdk/gdkwindow.c                     |   91 ++++---
 gdk/x11/gdkevents-x11.c             |   19 +-
 gtk/gtk.symbols                     |    2 +
 gtk/gtkentrybuffer.h                |    2 +-
 gtk/gtkinfobar.h                    |    4 +
 gtk/gtklabel.c                      |   84 +++++-
 gtk/gtklabel.h                      |    4 +
 po-properties/es.po                 |   91 ++++---
 po-properties/uk.po                 |  100 ++++---
 18 files changed, 412 insertions(+), 743 deletions(-)
---