[gtk+/native-layout: 58/59] Merge branch 'master' into native-layout
- From: Tristan Van Berkom <tvb src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/native-layout: 58/59] Merge branch 'master' into native-layout
- Date: Thu, 24 Jun 2010 23:26:01 +0000 (UTC)
commit 86f360fec256f53de6068665d8b322d47e9e0bf6
Merge: f1998d5 92befe0
Author: Tristan Van Berkom <tristan van berkom gmail com>
Date: Thu Jun 24 18:09:33 2010 -0400
Merge branch 'master' into native-layout
docs/RELEASE-HOWTO | 21 +-
docs/reference/gdk/gdk3-sections.txt | 1 +
docs/reference/gtk/gtk3-sections.txt | 2 +
docs/reference/gtk/migrating-2to3.xml | 1 +
gdk-3.0.pc.in | 2 +-
gdk/gdk.symbols | 1 +
gdk/gdkdevicemanager.c | 24 +
gdk/gdkdevicemanager.h | 2 +
gdk/gdkdisplay.c | 10 +-
gdk/gdkdraw.c | 4 +-
gdk/quartz/gdkdevicemanager-core.c | 11 +
gdk/win32/gdkdevicemanager-win32.c | 11 +
gdk/x11/gdkdevicemanager-core.c | 11 +
gdk/x11/gdkdevicemanager-xi2.c | 19 +
gdk/x11/gdkdevicemanager-xi2.h | 2 +
gdk/x11/gdkim-x11.c | 11 -
gtk+-3.0.pc.in | 2 +-
gtk/gtk.symbols | 2 +
gtk/gtkdnd.c | 5 +-
gtk/gtkicontheme.c | 2 +-
gtk/gtkmessagedialog.c | 43 +-
gtk/gtktable.c | 26 +
gtk/gtktable.h | 3 +
gtk/gtktextiter.c | 8 +-
gtk/gtkwidget.c | 87 +-
gtk/gtkwindow.c | 34 +-
gtk/gtkwindow.h | 2 +-
gtk/tests/builder.c | 31 +
gtk/tests/gtk-example-application.c | 2 +-
modules/other/gail/gailprogressbar.c | 3 -
modules/printbackends/cups/gtkprintbackendcups.c | 2 -
po-properties/gl.po | 3499 +++++++++++-----------
po/gl.po | 18 +-
tests/Makefile.am | 5 +
tests/testapplication.c | 11 +-
tests/testexpander.c | 88 +
tests/testinput.c | 41 +-
37 files changed, 2202 insertions(+), 1845 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]