Liang Qi bce25a6340 Merge remote-tracking branch 'origin/5.7' into 5.8 ... Conflicts: src/gui/painting/qcoregraphics.mm src/gui/painting/qcoregraphics_p.h src/plugins/platforms/cocoa/qcocoahelpers.h src/plugins/platforms/cocoa/qcocoahelpers.mm Change-Id: Ibe5efcae73526b3d3931ed22730b13d372dcf54e		2016-11-25 14:41:29 +01:00
..
mingw_make.cpp	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-11-25 10:32:29 +01:00
mingw_make.h	Merge remote-tracking branch 'origin/5.6' into dev	2016-01-26 16:27:28 +01:00
msbuild_objectmodel.cpp	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-11-15 09:58:16 +01:00
msbuild_objectmodel.h	Updated license headers	2016-01-21 18:55:18 +00:00
msvc_nmake.cpp	Merge remote-tracking branch 'origin/5.7' into 5.8	2016-11-25 14:41:29 +01:00
msvc_nmake.h	Updated license headers	2016-01-21 18:55:18 +00:00
msvc_objectmodel.cpp	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-11-15 09:58:16 +01:00
msvc_objectmodel.h	Merge remote-tracking branch 'origin/5.7' into 5.8	2016-11-24 10:31:21 +01:00
msvc_vcproj.cpp	Merge remote-tracking branch 'origin/5.7' into 5.8	2016-11-24 10:31:21 +01:00
msvc_vcproj.h	Updated license headers	2016-01-21 18:55:18 +00:00
msvc_vcxproj.cpp	Updated license headers	2016-01-21 18:55:18 +00:00
msvc_vcxproj.h	Updated license headers	2016-01-21 18:55:18 +00:00
winmakefile.cpp	Merge remote-tracking branch 'origin/5.7' into 5.8	2016-11-25 14:41:29 +01:00
winmakefile.h	Updated license headers	2016-01-21 18:55:18 +00:00