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
..
3rdparty	Merge remote-tracking branch 'origin/stable' into dev	2014-02-07 13:07:25 +01:00
android	Only Android API < 11 needs o set the surface type.	2014-01-31 12:07:59 +01:00
angle	Merge remote-tracking branch 'origin/stable' into dev	2014-02-07 13:07:25 +01:00
concurrent	QtConcurrent: Workaround GCC bug 58800 in median calculation	2013-12-03 11:45:18 +01:00
corelib	Merge remote-tracking branch 'origin/stable' into dev	2014-02-12 16:28:07 +01:00
dbus	Merge remote-tracking branch 'origin/stable' into dev	2014-02-07 13:07:25 +01:00
gui	Merge remote-tracking branch 'origin/stable' into dev	2014-02-12 16:28:07 +01:00
network	Merge remote-tracking branch 'origin/stable' into dev	2014-02-12 16:28:07 +01:00
opengl	Merge remote-tracking branch 'origin/stable' into dev	2014-02-12 16:28:07 +01:00
openglextensions
platformsupport	Merge remote-tracking branch 'origin/stable' into dev	2014-02-12 16:28:07 +01:00
plugins	Merge remote-tracking branch 'origin/stable' into dev	2014-02-12 16:28:07 +01:00
printsupport	Merge remote-tracking branch 'origin/stable' into dev	2014-02-12 16:28:07 +01:00
sql	Merge remote-tracking branch 'origin/stable' into dev	2014-02-07 13:07:25 +01:00
testlib	Merge remote-tracking branch 'origin/stable' into dev	2014-02-07 13:07:25 +01:00
tools	Merge remote-tracking branch 'origin/stable' into dev	2014-02-12 16:28:07 +01:00
widgets	Merge remote-tracking branch 'origin/stable' into dev	2014-02-12 16:28:07 +01:00
winmain	WinRT winmain: handle -qdevel parameter for additional debugging tooling	2014-01-30 22:09:55 +01:00
xml	expand tabs and related whitespace fixes in *.{cpp,h,qdoc}	2014-01-13 22:46:50 +01:00
src.pro	move and build qlalr	2014-01-20 09:26:47 +01:00