Gunnar Sletta b62bd0584a Merge branch 'refactor' ... Conflicts: mkspecs/qws/linux-lsb-g++/qmake.conf src/gui/image/qpixmap_mac.cpp src/gui/painting/qpaintengine_x11.cpp src/gui/painting/qtessellator.cpp src/gui/text/qfontengine_qws.cpp src/gui/text/qfontengine_x11.cpp src/gui/widgets/qlinecontrol.cpp src/opengl/qgl.h src/opengl/qgl_x11egl.cpp src/plugins/plugins.pro Change-Id: If52dcd55cd55f2983a756c2f843967702b60a310		2011-09-13 08:54:45 +02:00
..
configure	Merge branch 'refactor'	2011-09-13 08:54:45 +02:00
shared	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
uilib	Compile fix.	2011-09-01 10:55:44 +02:00