diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-01-19 14:08:57 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-01-19 14:08:57 +0100 |
| commit | a9a4e64127a06ca9d1ad7032e521a1181e0412f6 (patch) | |
| tree | fe9cceeb670130bc404fa7caba65d3c2378b26af | |
| parent | 3f5036da4222cc042f6db8c67d067db86b39eb38 (diff) | |
| parent | f4fb3e7d126919d21497e9e715ccf18c4a134d08 (diff) | |
| download | qtx11extras-a9a4e64127a06ca9d1ad7032e521a1181e0412f6.tar.gz | |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
.qmake.conf
Change-Id: I11c9042973955404311b85abe037125daf00d4bf
0 files changed, 0 insertions, 0 deletions