Liang Qi d148019f16 Merge remote-tracking branch 'origin/5.6' into 5.7 ... Conflicts: src/plugins/platforms/qnx/qqnxscreeneventhandler.cpp Change-Id: I0af32ee55936d523cbd259b6fe82eb9c409f9074		2016-09-16 23:16:25 +02:00
..
pbuilder_pbx.cpp	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-09-16 23:16:25 +02:00
pbuilder_pbx.h	Updated license headers	2016-01-21 18:55:18 +00:00