]> Pileus Git - ~andy/gtk/commit
Merge branch 'gtk-3-0' into broadway
authorAlexander Larsson <alexl@redhat.com>
Thu, 10 Mar 2011 09:51:04 +0000 (10:51 +0100)
committerAlexander Larsson <alexl@redhat.com>
Thu, 10 Mar 2011 09:51:04 +0000 (10:51 +0100)
commit4765f37484b28b99b18b8e7c96bc71754cfe9ebd
tree1bb2316ea8a334330baba2a49d583ae92775bade
parentd8f061ad42a52b626785d655af5d07a4cb7c7d98
parent934f4e5a25076421c8b7134282c5195e6414c96a
Merge branch 'gtk-3-0' into broadway

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