[gtk+/quartz-integration: 20/20] Merge branch 'master' into quartz-integration
- From: John Ralls <jralls src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/quartz-integration: 20/20] Merge branch 'master' into quartz-integration
- Date: Mon, 7 Feb 2011 07:30:25 +0000 (UTC)
commit 1d28849c179c7b816fdddaab0844fefc31b7abf6
Merge: 2654dda 14eb348
Author: John Ralls <jralls ceridwen us>
Date: Sun Feb 6 23:21:12 2011 -0800
Merge branch 'master' into quartz-integration
configure.ac | 140 ++++-----
gdk/win32/gdkdevice-win32.c | 6 +-
gdk/win32/gdkdisplay-win32.c | 3 -
gdk/win32/gdkdnd-win32.c | 33 +-
gdk/win32/gdkevents-win32.c | 79 +----
gdk/win32/gdkprivate-win32.h | 18 +-
gdk/win32/gdkscreen-win32.c | 1 -
gdk/win32/gdkselection-win32.c | 10 +-
gdk/win32/gdkwin32.h | 6 +-
gdk/win32/gdkwin32id.c | 2 +-
gdk/win32/gdkwindow-win32.c | 14 +-
gtk/gtk.symbols | 4 +
gtk/gtkcellrenderer.c | 23 +-
gtk/gtkcombobox.c | 10 +-
gtk/gtkcssprovider.c | 1 +
gtk/gtkentry.c | 19 +-
gtk/gtkspinbutton.c | 20 +-
gtk/gtkstyle.c | 1 +
gtk/gtkstylecontext.c | 2 +-
gtk/gtkthemingengine.c | 3 +
gtk/gtkwidget.c | 16 +-
gtk/makefile.msc.in | 23 +-
po/nb.po | 731 ++++++++++++++++++++++++----------------
po/pl.po | 265 +++++++++++----
tests/Makefile.am | 6 +-
tests/makefile.msc | 3 +-
tests/testsensitive.c | 111 ++++++
27 files changed, 932 insertions(+), 618 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]