Friedemann Kleint 1d53b6d9f2 Merge remote-tracking branch 'origin/5.13' into 5.14 ... Conflicts: tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp Change-Id: Idd3ca5cb9a2b95a4c3513b2a4c8966e6f56193f1		2019-09-09 07:51:49 +00:00
..
pbuilder_pbx.cpp	Merge remote-tracking branch 'origin/5.13' into 5.14	2019-09-09 07:51:49 +00:00
pbuilder_pbx.h	Merge remote-tracking branch 'origin/5.13' into 5.14	2019-09-09 07:51:49 +00:00