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



commit 4f76bc439bfaf4ef810c90a7cf941fbdbc6e53ab
Merge: b47149c 7741f5a
Author: John Ralls <jralls ceridwen us>
Date:   Sat Jul 16 05:10:05 2011 -0700

    Merge branch 'master' into quartz-integration

 docs/reference/gdk/gdk3-sections.txt |    2 +
 gdk/gdk.symbols                      |    2 +
 gdk/x11/Makefile.am                  |    2 +
 gdk/x11/gdkdevice-xi2.c              |    8 +
 gdk/x11/gdkdevicemanager-x11.c       |   85 ++
 gdk/x11/gdkdevicemanager-xi2.c       |   11 +
 gdk/x11/gdkprivate-x11.h             |    5 +
 gdk/x11/gdkx.h                       |    2 +
 gdk/x11/gdkx11device.h               |   35 +
 gdk/x11/gdkx11devicemanager.h        |   39 +
 gtk/gtkmessagedialog.c               |    4 +-
 gtk/gtkthemingengine.c               |    4 +-
 po-properties/he.po                  | 1914 +++++++++++++++++-----------------
 po/he.po                             |  260 +++---
 14 files changed, 1302 insertions(+), 1071 deletions(-)
---



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