Liang Qi 680dd3313c Merge remote-tracking branch 'origin/5.6' into 5.7 ... Conflicts: src/corelib/global/qlogging.cpp Change-Id: I9cc8f25ad897efab6a42cb5c5161b1c9402952f0		2016-09-23 22:28:33 +02:00
..
pbuilder_pbx.cpp	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-09-23 22:28:33 +02:00
pbuilder_pbx.h	Updated license headers	2016-01-21 18:55:18 +00:00