diff options
| author | Sergio Ahumada <sahumada@texla.cl> | 2015-02-22 22:21:39 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-02-22 22:21:39 +0000 |
| commit | e7e34562fe4264dd84e246aa5b12ad14d8eb9021 (patch) | |
| tree | 8dd459f66b18a0096848e86cfb7edc3815312ccf /.qmake.conf | |
| parent | e5ffc6a876631bf27feee793734209271db82bd9 (diff) | |
| parent | f9014d136f504c6377d1329c822f11a8b58ccdbe (diff) | |
Merge "Merge remote-tracking branch 'origin/5.4' into dev" into refs/staging/dev
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions