Kristian Høgsberg c7514e8f0d Merge branch 'gdk-backend-wayland' ...

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

2011-04-12 09:52:44 -04:00

3.9 KiB

Raw Blame History

View Raw