[gtk+/xi2: 764/1239] Merge branch 'events-refactor' into xi2

From: Carlos Garnacho <carlosg src gnome org>
To: svn-commits-list gnome org
Cc:
Subject: [gtk+/xi2: 764/1239] Merge branch 'events-refactor' into xi2
Date: Tue, 29 Sep 2009 10:50:06 +0000 (UTC)

commit b19470e0469c003c5a716abd8632fb7644f4f51e
Merge: 3f75328... be37211...
Author: Carlos Garnacho <carlos lanedo com>
Date:   Sat Aug 15 17:14:49 2009 +0200

    Merge branch 'events-refactor' into xi2
    
    Conflicts:
    	gdk/gdkdevice.c

 gdk/gdkdevice.c        |  360 ++++++++++++++++++++++++++++++++++++++++++++----
 gdk/gdkdeviceprivate.h |   23 +++-
 2 files changed, 354 insertions(+), 29 deletions(-)
---

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