Liang Qi c7934f2489 Merge remote-tracking branch 'origin/5.6' into dev ... Conflicts: src/corelib/io/qprocess.cpp src/corelib/io/qprocess_unix.cpp src/network/kernel/qnetworkinterface_winrt.cpp tools/configure/configureapp.cpp Change-Id: I47df00a01597d2e63b334b492b3b4221b29f58ea		2015-11-18 09:01:51 +01:00
..
configure	Merge remote-tracking branch 'origin/5.6' into dev	2015-11-18 09:01:51 +01:00
shared/windows	Update copyright headers	2015-02-11 06:49:51 +00:00