Frederik Gladhorn a9c88c1f39 Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: src/gui/image/qimage.cpp src/gui/text/qtextengine.cpp src/plugins/platforms/linuxfb/qlinuxfbscreen.cpp src/printsupport/kernel/qprintengine_win.cpp Change-Id: I09ce991a57f39bc7b1ad6978d0e0d858df0cd444		2014-02-12 16:28:07 +01:00
..
qmake.conf	Merge remote-tracking branch 'origin/stable' into dev	2014-02-12 16:28:07 +01:00
qplatformdefs.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00