Liang Qi d456f87ece Merge remote-tracking branch 'origin/5.6' into dev ... Conflicts: src/corelib/io/qfilesystemwatcher_win.cpp src/corelib/plugin/plugin.pri src/plugins/platforms/cocoa/qcocoaaccessibility.mm tests/auto/corelib/tools/qlocale/tst_qlocale.cpp Change-Id: Id6824631252609a75eff8b68792e4d10095c8fc1		2016-02-11 08:25:04 +01:00
..
unixmake.cpp	Merge remote-tracking branch 'origin/5.6' into dev	2016-02-11 08:25:04 +01:00
unixmake.h	Merge remote-tracking branch 'origin/5.6' into dev	2016-01-26 16:27:28 +01:00
unixmake2.cpp	Merge remote-tracking branch 'origin/5.6' into dev	2016-02-11 08:25:04 +01:00