Liang Qi cdb56c42fc Merge remote-tracking branch 'origin/5.7' into 5.8 ... Conflicts: mkspecs/features/uikit/xcodebuild.mk tests/auto/other/lancelot/tst_lancelot.cpp tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp Change-Id: Ia0ae2de86094120281abd445138877c2cc3e882c		2016-09-29 00:38:01 +02:00
..
pbuilder_pbx.cpp	Merge remote-tracking branch 'origin/5.7' into 5.8	2016-09-29 00:38:01 +02:00
pbuilder_pbx.h	Updated license headers	2016-01-21 18:55:18 +00:00