]> Pileus Git - ~andy/gtk/commit
Merge branch 'gdk-backend-wayland'
authorKristian Høgsberg <krh@bitplanet.net>
Tue, 12 Apr 2011 13:52:44 +0000 (09:52 -0400)
committerKristian Høgsberg <krh@bitplanet.net>
Tue, 12 Apr 2011 13:52:44 +0000 (09:52 -0400)
commitc7514e8f0d19a833257497caff413bb4dfae6eb4
tree7dc4bbd5b5a162b5b0b0277c68f7b7e3c6dd457b
parent85c1c22d04d369529ec4c3b6f608270f4f394cb5
parentfcd58b0ffd0935567437b89bb077f60195336764
Merge branch 'gdk-backend-wayland'

Conflicts:
Makefile.am
configure.ac
gdk/Makefile.am
gtk/gtksettings.c
gtk/gtkwindow.c
Makefile.am
configure.ac
gdk/Makefile.am
gdk/gdkdisplaymanager.c
gtk/gtkwindow.c