diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-09-16 15:30:03 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-09-16 15:30:03 +0200 |
| commit | a21bbb45019e1bbc7b583811ff2e84757082a01a (patch) | |
| tree | 0c3114b5a58fe5ced1db712c0cd12b2358b8dcdf /.qmake.conf | |
| parent | ad22f63229345aca8d8ab0eba5dba17cbb6614f1 (diff) | |
| parent | 031f59c5c43d3be19b7710c34e1f8b67df3486e1 (diff) | |
| download | qtx11extras-a21bbb45019e1bbc7b583811ff2e84757082a01a.tar.gz | |
Merge remote-tracking branch 'origin/5.3' into 5.4v5.4.0-rc1v5.4.0-beta1v5.4.05.4.0
Conflicts:
.qmake.conf
Change-Id: I6359e74f475d169dbc8a1d7bbb4784b0fc45e87b
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions