]> Pileus Git - ~andy/gtk/commit
Merge remote-tracking branch 'origin/master' into gdk-backend-wayland
authorKristian Høgsberg <krh@bitplanet.net>
Sat, 26 Feb 2011 19:44:29 +0000 (14:44 -0500)
committerKristian Høgsberg <krh@bitplanet.net>
Sat, 26 Feb 2011 19:44:29 +0000 (14:44 -0500)
commit287d91e5f994d059232731133870ba9e95c8e418
tree1a1e6828b9d616632818396476b5b6a3a3df4cb6
parentb5134619a047cd208257ff0adc7d3aeb54bdd426
parentf04504ac94741171ac63de04a8bd29cbe210427a
Merge remote-tracking branch 'origin/master' into gdk-backend-wayland

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