diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-14 19:51:50 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-14 19:51:50 +0200 |
commit | 09674580bb1c2225678db5d22a1c092a86aaa75d (patch) | |
tree | 586129226bdb6441899bdc6341b5c5987e25d146 /.qmake.conf | |
parent | e24bc6bf130585c63cfd15669a92446d108964cf (diff) | |
parent | 021a503205caf1c645aca0610f3b6fc07a17f998 (diff) | |
download | qtscript-09674580bb1c2225678db5d22a1c092a86aaa75d.tar.gz |
Merge remote-tracking branch 'origin/5.6' into dev
Change-Id: If70c0cf0d42c8d94201d8a10ef5724487ad69379
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions