diff options
author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-01-02 12:32:41 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-01-02 12:32:41 +0100 |
commit | 3f5036da4222cc042f6db8c67d067db86b39eb38 (patch) | |
tree | fe9cceeb670130bc404fa7caba65d3c2378b26af | |
parent | d8d69191fd6b709bdb57c6eff5612317e81f697d (diff) | |
parent | ffeff89b8497d42ed2a786053a9a14775f77f782 (diff) | |
download | qtx11extras-3f5036da4222cc042f6db8c67d067db86b39eb38.tar.gz |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
.qmake.conf
Change-Id: I222537ffb88473069d8cea5a98d6955e7756898d
0 files changed, 0 insertions, 0 deletions