diff options
author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-02-01 20:43:29 +0100 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-02-01 20:43:30 +0100 |
commit | 6ba26317d0fc0573aca7638eda8bdb91e52d1ab3 (patch) | |
tree | 061ddc3d0977fc6364eb3275a3da4287fd1a7869 /.qmake.conf | |
parent | cd39a62bbd5c6e725547a696c297c46f929b3439 (diff) | |
parent | 835f8a90387c8d62e7ab262d23e3ab103aa6d133 (diff) |
Merge dev into 5.9
Change-Id: I8436b1be632b80aae340cc692795ba86b4e3e79b
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions