Frederik Gladhorn 80604a0786 Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: src/corelib/global/qglobal.h src/plugins/platforms/cocoa/qnsview.mm Change-Id: I6fe345df5c417cb7a55a3f91285d9b47a22c04fa		2013-06-04 19:34:36 +02:00
..
.gitignore	Moved tests into integrationtests/ and widgets/	2011-10-20 19:45:41 +02:00
qgraphicsgridlayout.pro	widget/graphicsview: Do not run tests showing windows in parallel.	2013-06-03 13:48:41 +02:00
tst_qgraphicsgridlayout.cpp	Merge remote-tracking branch 'origin/stable' into dev	2013-06-04 19:34:36 +02:00