[gtk+/quartz-integration: 551/551] Merge branch 'master' into quartz-integration



commit 8b92af5299f36326df41d51bad8212ac3f6b3a5f
Merge: 01dc12f 38b8ab3
Author: John Ralls <jralls ceridwen us>
Date:   Tue Nov 23 16:25:32 2010 -0800

    Merge branch 'master' into quartz-integration

 docs/reference/gtk/gtk3-sections.txt |   40 +
 gdk/gdkdevice.c                      |  144 ++-
 gdk/gdkdevice.h                      |   15 +-
 gdk/gdkdisplay.c                     |   18 +-
 gdk/gdkevents.c                      |   11 +-
 gdk/gdkinternals.h                   |    6 +
 gdk/gdkwindow.c                      |   22 +-
 gdk/quartz/gdkevents-quartz.c        |   33 +-
 gdk/win32/gdkevents-win32.c          |   33 +-
 gdk/x11/gdkdevice-core.c             |    4 +-
 gdk/x11/gdkdevice-xi.c               |   15 +-
 gdk/x11/gdkdevice-xi2.c              |    2 +-
 gdk/x11/gdkdevicemanager-xi.c        |   15 +-
 gdk/x11/gdkdevicemanager-xi2.c       |    8 +-
 gdk/x11/gdkdisplay-x11.c             |    4 +-
 gdk/x11/gdkeventsource.c             |   30 +-
 gtk/gtkbutton.c                      |    4 +-
 gtk/gtkcellrendereraccel.c           |    2 +-
 gtk/gtkcolorsel.c                    |    2 +-
 gtk/gtkcombobox.c                    |    2 +-
 gtk/gtkdnd.c                         |    2 +-
 gtk/gtkentry.c                       |    2 +-
 gtk/gtkmenu.c                        |    2 +-
 gtk/gtkmenushell.c                   |    2 +-
 gtk/gtkplug-x11.c                    |    2 +-
 gtk/gtkscalebutton.c                 |    2 +-
 gtk/gtktooltip.c                     |    2 +-
 gtk/gtktreeview.c                    |    2 +-
 gtk/gtkwindow.c                      |    2 +-
 gtk/updateiconcache.c                |   42 +-
 po/de.po                             | 2220 +++++++++++++++++-----------------
 tests/gtkoffscreenbox.c              |    4 +-
 tests/testinput.c                    |   19 +-
 33 files changed, 1448 insertions(+), 1265 deletions(-)
---



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