Liang Qi f285687584 Merge remote-tracking branch 'origin/5.7' into dev ... Conflicts: examples/corelib/ipc/ipc.pro src/plugins/platforms/xcb/qxcbbackingstore.cpp tests/auto/corelib/tools/qcommandlineparser/tst_qcommandlineparser.cpp Change-Id: Ia006e10ff1732fe78f90138c41f05b59b49486cf		2016-04-05 14:22:45 +02:00
..
configure	Merge remote-tracking branch 'origin/5.7' into dev	2016-04-05 14:22:45 +02:00
shared/windows	Updated license headers	2016-01-21 18:55:18 +00:00