Merge the xi2-for-master branch

2010-05-25 18:38:44 -04:00
parent a538f639b6
commit bd4609b140
124 changed files with 18218 additions and 10349 deletions
--- a/gdk/gdkglobals.c
+++ b/gdk/gdkglobals.c
@ -40,6 +40,7 @@ gchar              *_gdk_display_name = NULL;
 gint                _gdk_screen_number = -1;
 gchar              *_gdk_display_arg_name = NULL;
 gboolean            _gdk_native_windows = FALSE;
+gboolean            _gdk_enable_multidevice = FALSE;

 GSList             *_gdk_displays = NULL;