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
..
arch	Update the Intel copyright year	2016-01-21 22:44:16 +00:00
common	Merge "Merge remote-tracking branch 'origin/5.6' into dev" into refs/staging/dev	2016-01-26 11:27:37 +00:00
mac/corewlan	Updated license headers	2016-01-15 12:25:24 +00:00
qpa	Update the Intel copyright year	2016-01-21 22:44:16 +00:00
unix	Merge remote-tracking branch 'origin/5.6' into dev	2016-02-11 08:25:04 +01:00
win/directwrite	Updated license headers	2016-01-15 12:25:24 +00:00
x11	Updated license headers	2016-01-15 12:25:24 +00:00
.gitignore	Initial import from the monolithic Qt.	2011-04-27 12:05:43 +02:00
.qmake.conf	Handle INCLUDE and LIB environment variables in config.tests for MinGW	2013-11-22 07:30:57 +01:00