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
..
access	Merge remote-tracking branch 'origin/stable' into dev	2014-02-12 16:28:07 +01:00
bearer	expand tabs and related whitespace fixes in *.{cpp,h,qdoc}	2014-01-13 22:46:50 +01:00
kernel	Merge remote-tracking branch 'origin/stable' into dev	2014-01-20 18:18:59 +01:00
socket	Merge remote-tracking branch 'origin/stable' into dev	2014-01-20 18:18:59 +01:00
ssl	Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev	2014-01-21 17:57:54 +01:00
network.pro	Re-enable network tests on Mac OS.	2012-04-24 16:06:28 +02:00