fix merge
authorSimo Fält <simo.falt@digia.com>
Wed, 5 Feb 2014 07:35:12 +0000 (09:35 +0200)
committerSimo Fält <simo.falt@digia.com>
Wed, 5 Feb 2014 07:35:12 +0000 (09:35 +0200)
commit23acc2ba98c3eda1c2a0f5c76165379323d4f3b3
tree79eb8c5565c531e0a0d5c78b1e389c0430dd6436
parentfbeb29700a13266f8c7fc3a211a7071dcbd3a84d
fix merge
scripts/qt/qtmod_test.pl