]> Pileus Git - ~andy/gtk/commit
Merge branch 'master' into client-side-windows
authorAlexander Larsson <alexl@redhat.com>
Mon, 25 May 2009 12:30:01 +0000 (14:30 +0200)
committerAlexander Larsson <alexl@redhat.com>
Mon, 25 May 2009 12:30:01 +0000 (14:30 +0200)
commit7698daf97aced5c22aeeb7bfbf02567b61cebaef
tree3af0c19ca365eea39c6bee7c272b21fb3484d5eb
parent1288ef1707dbb9a38d58be8c0dece6ea15a5ba00
parentd0f887ddb144a69a85371041d1ad3640ab379ee8
Merge branch 'master' into client-side-windows

Conflicts:
gdk/x11/gdkwindow-x11.c
gdk/Makefile.am
gdk/win32/gdkdisplay-win32.c
gdk/x11/gdkdnd-x11.c
gdk/x11/gdkevents-x11.c
gdk/x11/gdkproperty-x11.c
gdk/x11/gdkselection-x11.c
gdk/x11/gdkwindow-x11.c
tests/Makefile.am